@Mike **************
the same situation as in he WAS on an OA, bounced out of the country to come in visa exempt and is now gonna apply for an in country Non-O visa ?
I would say FILE a new one you're on a totally new stamp, you don't have a "primary residence" you're here as a "tourist"