After you file

To be sure I understand correctly, a timely filed return would be for the current tax year and NOT for an amended tax year?  In other words, I would need to elect the change in 2017 and include all PY's amounts.