IF you have NOT YET filed and you will be affected by these possible changes you really should WAIT to file the return so you don't need to amend the return later. Amended returns take months to process so filing once correctly it best.
