@Ellie ******
thanks, yes, I believe I must go to immigration to apply for non-O with no less than 21 days left on the visa exempt. not sure if that will change since they will be giving 45 day exempts starting October, which is when I am coming back from Canada. Anyway. I'd go to immigration as soon as I'm back. 🙂 Thanks for your help.