My situation is somewhat complicated. My grant funding is set to expire in two months, but my DS-2019 is extended until next summer in 2025 because my advisor wanted to ensure I have ample time for waiving and job searching. However, we're currently facing a funding shortage, and being unpaid on a J-1 visa is not feasible. Therefore, I'm considering transitioning to a self-funded postdoc using my own resources. The international office initially approved this plan, but now they're uncertain whether I need a new DS-2019 due to the change in funding source. However, I've already had it waived! Can I switch from grant-funded to self-funded without altering my DS-2019, considering it's already been waived?