When is my next 90-day check-in after receiving a Non O retirement visa extension?

On a 1 year extension, for a Non O retirement visa, set to expire on April 13th, 2025. Came back into Thailand on Jan 16th, 2025. Needed a certificate of residency (to obtain a Thai DL), and received that certificate on Feb 25th.

Then I just renewed my visa with another 1 year extension, on March 6th, which was dated as valid until April 13, 2026.

So, I’m unsure about when my next 90 day check in is required. Is it 90 days after the last time I entered the country (90 days from Jan 16th)?

Or did the certificate of residency, effectively create a 90 day check in. And therefore my next 90 day would be due 90 days after February 25th?

Or is my next 90 day check in due 90 days after the start of my new visa extension (90 days from April 13th).

Thanks in advance🙏