@Njdre80
If you owe then you have until 4/15 to file the return and pay the balance due ... in your situation I would WAIT to see what happens. If they do change the law before 4/15 then you will be able to make the change on the return BEFORE you file it and will not need to amend anything.
