Good question, James. Didn’t decide yet because I still don’t know if I can apply for the Non O inside Thailand having now an extension based on ED visa. If I have to leave Thailand to re-enter with tourist visa then I would consider to apply outside if it’s easier