@PATAX 

Re the non-deductible - possibly.  I didn't look at the math.

But unless one is in CA, or some of the other disaster declared areas the deadline for last year was 4.18.23

And as the OP was talking amended.... has to be 2022?  Right?   Have I lost it (again 😉