; (B) by redesignating clause (iii) as clause (v); (C) in clause (v) (as redesignated), by inserting or (iv) after clause (ii) ; and (D) by inserting after clause (ii) the following new clauses: (iii) For individuals who initially become eligible for old-age or disability insurance benefits, or who die (before becoming eligible for such benefits), in the calendar year 2018, the amount established for purposes of clause (iv) of subparagraph (A) shall be $10,958. (iv) For individuals who initially become eligible for old-age or disability insurance benefits, or who die (before becoming eligible for such benefits), in any calendar year after 2018, the amount established for purposes of clause (iv) of subparagraph (A) shall equal the product of the amount established with respect to the calendar year 2018 under clause (iii) of this subparagraph and the quotient obtained by dividing— (I) the national average wage index (as defined in section 209(k)(1)) for the second calendar year preceding the calendar year for which the determination is made, by (II) the national average wage index (as so defined) for 2016. . (b) Basic AIME and surplus AIME (1) Basic AIME Section 215(b)(1) of such Act ( 42 U.S.C. 415(b)(1) ) is amended— (A) by inserting basic before average ; and (B) in subparagraph (A), by striking paragraph (3) and inserting paragraph (3)(A) and by inserting before the comma the following: to the extent such total does not exceed the contribution and benefit base for the applicable year . (2) Surplus AIME (A) In general Section 215(b)(1) of such Act (as amended by paragraph (1)) is amended— (i) by redesignating subparagraphs (A) and (B) as clauses (i) and (ii), respectively; (ii) by inserting (A) after (b)(1)