I-864 question

I understand that if I have enough funds (income), then I need not include my spouse's income for the purpose of affidavit of support. In that case, for form I-864:

1. P.4, Part 6, from question 8 on (Income you ar using from any other person who was counted in your household size ...): I just leave it blank, correct?

2. P.5, Part 6, Q 24a-24c: the tax retures for the past 3 years were filed with my wife (married filing jointly). Do I enter the total income (including mine and my wife's incomes) as shown in 1040, or JUST mine (as shown in my W2's)?

Thanks!!