Hi, I have a 30 day stamp on arrival by land from Cambodia, that expires on the 9th of June. I am in the process of cobbling together the paperwork for a Non-B. I believe the application for that visa requires at least 15 days validity? If so I need to extend this free on arrival stamp at a Thai Immigration office, a further 30 days, and then proceed out of the country for the Non-B? Thanks for your great collective advice.