; 135 Stat. 1350); or (2) any allocations of those amounts. 3. Clean watersheds needs survey Section 516(b) of the Federal Water Pollution Control Act ( 33 U.S.C. 1375(b) ) is amended— (1) by striking paragraph (2); (2) in paragraph (1)— (A) in the third sentence, by striking Whenever the Administrator, and inserting the following: (3) Submission to Congress Whenever the Administrator, ; and (B) in the second sentence, by striking The Administrator shall and inserting the following: (2) Deadline The Administrator shall ; (3) by striking the subsection designation and all that follows through The Administrator, in paragraph (1) and inserting the following: (b) Estimates; studies; analyses (1) In general The Administrator, ; and (4) in paragraph (1) (as so amended)— (A) by striking ; and (D) a comprehensive and inserting the following: ; and (D) a comprehensive ; (B) by striking (C) a comprehensive and inserting the following: (C) a comprehensive ; (C) by striking (B) a detailed estimate and all that follows through in each of the States; and inserting the following: (B) a detailed estimate, biennially revised, of the cost of construction of all planned publicly owned treatment works in each State, and all needed publicly owned treatment works in each State, which shall include a detailed estimate of— (i) the cost of construction for rehabilitating or upgrading all existing publicly owned treatment works (excluding any pipe or other device or system for the conveyance of wastewater) every 20 years, including the cost of implementing measures necessary to address the resilience and sustainability of publicly owned treatment works to manmade or natural disasters; and (ii) the cost of construction for replacing 10 percent of existing publicly owned pipes and other devices and systems for the conveyance of wastewater to publicly owned treatment works over the 20-year period following the date of the estimate;