Since it is virtually impossible for Preparers to remember everyone who opted to treat Retirement Distributions as Coronovirus Related Disaster and the distribution did not carry over into 2021 Tax Return on the software, can the repayment begin on the 2022 Tax return or do we have to amend the 2021 return to include repayment amount?