@Ellie ******
Thank you for your reply. Then In the case of entering Thailand on Non-O based on marriage. Do I still need to wait for being married for 2 months until apply for one year extension? And I will have to apply it 45 days before the Non-O expires?