@Rick ********
Careful. The "O" in non-O stands for other. There are MANY non-O visas, including retirement, marriage, volunteering, parent of a half-Thai child, etc. You can't just say non-O, you have to say non-O retirement or non-O marriage, which are the 2 being discussed for you.
It's the non-O marriage that has the 400,000 requirement, whereas the non-O retirement has an 800,000 requirement.