What should I include on my TM7 extension form regarding my reentry permit and arrival details?

Hello to all,

I am due for my next extension based on marriage to my Thai wife next month. With all previous extensions I have used the initial arrival date in 2018 and the associated TM.6 card information to fill out my TM7 extension form. Last year, we took a trip back to the states. I re-entered using the reentry permit that I purchased at immigration, so as not to lose the validity of my current extension. My question is this, on my upcoming extension next month on the TM7 extension form. Should I put the number from the reentry permit on the TM.7 form? I am aware that the TM6 has been discontinued and obviously I did not receive one on the return trip, so I am wondering what I should enter on the TM7 extension form in the fields for-port of arrival, date and number where the TM.6 is asked for. Many thanks in advance!