The current extension of my non-O visa (retirement) expires on 6 April; my 90-day check-in is due by 3 April. Am I correct in assuming that applying for a one-year extension of the non-O visa (i.e., to stay another year) will not satisfy the requirement for the 90-day check-in?