; (B) by striking age 19 and inserting age 22 ; (C) by striking clause (i) of paragraph (1)(B) and inserting clause (ii) of paragraph (1)(B) ; and (D) by adding at the end the following: (ii) A child who attains age 23 at a time when he is a full-time post-secondary school student (as defined in subparagraph (A) of this paragraph and without application of subparagraph (B) of such paragraph) but has not (at such time) completed the requirements for, or received, a diploma or equivalent certificate from a post-secondary educational institution (as defined in subparagraph (C)(iii)) shall be deemed (for purposes of determining whether his entitlement to benefits under this subsection has terminated under paragraph (1)(F) and for purposes of determining his initial entitlement to such benefits under clause (iii) of paragraph (1)(B)) not to have attained such age until the first day of the first month following the end of the quarter or semester in which he is enrolled at such time (or, if the post-secondary educational institution (as so defined) in which he is enrolled is not operated on a quarter or semester system, until the first day of the first month following the completion of the course in which he is so enrolled or until the first day of the third month beginning after such time, whichever first occurs). . (e) Effective date The amendments made by this section shall apply with respect to applications for child’s insurance benefits filed in calendar year 2020 and with respect to individuals entitled to such benefits during any month of such calendar year, except that such amendments shall not apply for purposes of determining continuing eligibility for child’s insurance benefits for any month after such calendar year. 7. Improving Social Security benefits for widows and widowers in two-income households (a) In general (1) Widows Section 202(e) of the Social Security Act ( 42 U.S.C. 402(e) ) is amended— (A) in paragraph (1)— (i) in subparagraph (B), by inserting and at the end