T3012A Calculation

Hello, I'm looking for help filling out my T3012A. I contributed $12,000 in 2025 ($1000/month), and declared $2000 of it on my 2024 tax return since it was in the first 60 days. I'm not sure if this matters for this form, but I didn't realize that I was $1000 over-contributed after getting my 2024 NoA. Does this affect Line 3 at all? Is the math below correct?

T3012A for 2025

Line 1: $12,000

Line 2: $2000

Line 3: $2000

Line 4: $0

Line 5: $0

Line 6: $0

Line 7: $2000 (Sum of Line 3, 4, 5, 6)

Line 8: $10,000 (Line 1 minus Line 7)

Thank you for your help! :)