; ; and (3) in subparagraph (B), by striking 1 year after completion of the project for which the loan was made and all that follows through design life of the project; and inserting 18 months after completion of the project for which the loan was made; . (g) Needs survey Section 1452(h) of the Safe Drinking Water Act ( 42 U.S.C. 300j–12(h) ) is amended— (1) by striking The Administrator and inserting (1) The Administrator ; and (2) by adding at the end the following new paragraph: (2) Any assessment conducted under paragraph (1) after the date of enactment of the Drinking Water System Improvement Act of 2017 shall include an assessment of costs to replace all lead service lines (as defined in section 1459B(a)(4)) of all eligible public water systems in the United States, and such assessment shall describe separately the costs associated with replacing the portions of such lead service lines that are owned by an eligible public water system and the costs associated with replacing any remaining portions of such lead service lines, to the extent practicable. . (h) Other authorized activities Section 1452(k)(1)(C) of the Safe Drinking Water Act ( 42 U.S.C. 300j–12(k)(1)(C) ) is amended by striking for fiscal years 1996 and 1997 to delineate and assess source water protection areas in accordance with section 1453 and inserting to delineate, assess, and update assessments for source water protection areas in accordance with section 1453 . (i) Authorization for capitalization grants to States for State drinking water treatment revolving loan funds Section 1452(m) of the Safe Drinking Water Act ( 42 U.S.C. 300j–12(m) ) is amended— (1) by striking the first sentence and inserting the following: (1) There are authorized to be appropriated to carry out the purposes of this section— (A) $1,200,000,000 for fiscal year 2018; (B) $1,400,000,000 for fiscal year 2019; (C) $1,600,000,000 for fiscal year 2020; (D) $1,800,000,000 for fiscal year 2021; and (E) $2,000,000,000 for fiscal year 2022.