Amendment deadline clarification

Just to clarify, the deadline for filing  amendments to 2019 returns is 7/15/2023, since the original due date was moved to 7/15/2020.  Likewise, for 2020 returns the deadline is 5/15/2024.  If extended then it’s the filing date plus 3 years if filed after the original due date.  Correct?