Thanks for the update. Those are definitely two critical things.

If you don't mind, can you mark your update as the correct answer for future readers?