What documents do I need to change my 90-day non-immigrant O visa to a retirement visa in Chiang Mai?

Hello all. I'm going to Thai Immigration office here in Chiang Mai early next week to change the status of my 90 day non-immigrant O- single entry visa to retirement visa. I'm gathering all necessary forms, copies, photos, etc. I want to make sure that I have everything before I go. Here is my understanding of what is needed. And I've put in parentheses what I need clarified when I've discovered conflicting info from sources or I can't locate something.

1. TM-7 application form- I have downloaded it.

2. Passport photo- 2x2" / 4x6 cm taken within last 6 months, sign full name on back of photo. (DO I NEED MORE THAN ONE PHOTO??)

3. Copies of each passport page and sign each page

4. Personal Data form (I haven't been able to locate this form!!) CM Buddy links you to Thai Immigration and all of the downloads are written in Thai.)

5. I have a notarized affidavit from US Consulate verifying my monthly income which I had done on Tuesday of this week.

6. It's my understanding that police clearance and medical certificate are not required as I'm applying from inside Thailand.

Tod Daniels, or anyone with recent prior experience , can you please review this and let me know your thoughts? Do you have a specific link to the personal data form? Thank you so much!!

regards,

Bill