J1 need help

I am holding J1 visa. Now I have a question. I am applying for the J1 waiver now, it is pending. If I got the waiver, but I have to change the lab, do I need a new DS2019 form, even in the same unviersty? And I need a new form, do I need get waiver again? I think it is very trouble. After I get waiver, I will change a lab for H1 application.