USA passport/s, type O visa, Thai wife. I report to CW. I have a couple questions RE: the info I need to put onto my TM7 and the Transfer Stamp To New Passport form. Extension expires Jan. 13, 2022.

Just got a new passport as old one expires in March 22. Wanted to get that done before reporting for my extension of stay. New passport number is of course different. Which PP # should I use on the TM7? Assuming the new one, but want to check first.

Old passport has hole punched in it so isn't "valid" but still has my Type O visa in it and of course all my stamps for the past 9 years.

My plan is to also fill out and bring the Transfer Stamp To New Passport form to have that done while there. Would this be the correct procedure? Thanks for any help.