; (G) in subsection (g)(2), by striking Such and inserting Except as provided in subsections (k)(5) and (aa), such ; (H) in subsection (h)(2)(A), by inserting and subsection (aa) after subparagraphs (B) and (C) ; and (I) in section 223(a)(2), by striking section 202(q) and inserting sections 202(q) and 202(aa) . (2) Section 209(k)(1) of such Act ( 402 U.S.C. 409(k)(1) ) is amended by inserting 202(aa)(3)(C)(i)(II), before 203(f)(8)(B)(ii) . 4. Extension of child’s benefit for certain post-secondary students under age 22 (a) In general Section 202(d)(1)(B) of the Social Security Act ( 42 U.S.C. 402(d)(1)(B) ) is amended to read as follows: (B) at the time such application was filed was unmarried and— (i) had not attained the age of 18, (ii) was a full-time elementary or secondary school student and had not attained the age of 19, (iii) was an eligible full-time post-secondary school student and had not attained the age of 22, or (iv) is under a disability (as defined in section 223(d)) which began before he attained the age of 22, and . (b) Definition of eligible full-Time post-Secondary school student Section 202(d)(7) of the Social Security Act ( 42 U.S.C. 402(d)(7) ) is amended by adding at the end the following: (E) An eligible full-time post-secondary school student is a full-time post-secondary school student who is entitled to child’s insurance benefits on the basis of the wages and self-employment income of an individual who is entitled to disability insurance benefits, or who has died a fully or currently insured individual. . (c) Definition of full-Time post-Secondary school student (1) In general Section 202(d)(7) of such Act ( 42 U.S.C. 402(d)(7) ) is amended— (A) in subparagraph (A)— (i) by inserting and a full-time post-secondary school student is an individual who is in full-time attendance as a student at a post-secondary educational institution before , as determined by the Commissioner ; (ii) by inserting or a full-time post-secondary school student before if he is paid by his employer