Retirement tax questions

Which year TurboTax are you asking about, 2016 TurboTax to amend your 2016 tax return to add the nondeductible traditional IRA contribution and prepare 2016 Form 8606 or 2017 TurboTax to report the distribution that you received in 2017?