@Ellie ******
thank you, I read that in the website, as well as in the requirements page for the Non-O, but you know, sometimes the website is the last thing they update...
Sadly I'm not eligible yet for the 60 days extension, as I have to been married for 2 months before applying for it - and my current visa will be expired by then. Process with the amphur took longer than expected...