After you file

Yes.  Then you will put in 0 for the 2016 AGI at the end to verify.