With new tax revisions possible, do I need to pay estimated tax before 12/31/2017 or is 1/15/2018 still correct. I pay only federal estimated and not state.