; (2) in subsection (b)(2)— (A) in the paragraph heading, by striking 2020 and 2021 and inserting after 2019 ; and (B) by striking 2020 and 2021 and inserting 2022 through 2024 ; and (3) in subsection (e)(1), by striking 2020 and 2021 and inserting 2022 through 2024 . 2015. Final rating opinion letters Section 5028(a)(1)(D)(ii) of the Water Infrastructure Finance and Innovation Act of 2014 ( 33 U.S.C. 3907(a)(1)(D)(ii) ) is amended by striking final rating opinion letters from at least 2 rating agencies and inserting a final rating opinion letter from at least 1 rating agency . 2016. Reauthorization of clean water State revolving funds Section 607 of the Federal Water Pollution Control Act ( 33 U.S.C. 1387 ) is amended— (1) in the matter preceding paragraph (1), by striking There is and inserting There are ; and (2) by striking paragraphs (1) through (5) and inserting the following: (1) $2,000,000,000 for fiscal year 2022; (2) $2,500,000,000 for fiscal year 2023; and (3) $3,000,000,000 for fiscal year 2024. . 2017. Wastewater infrastructure discretionary grant program (a) Establishment Subject to the availability of appropriations, not later than 1 year after the date of enactment of this Act, the Administrator of the Environmental Protection Agency (referred to in this section as the Administrator ) shall establish a wastewater discretionary grant program (referred to in this section as the program ) to provide grants, on a competitive basis, to eligible entities described in subsection (b) for investments in wastewater infrastructure projects. (b) Eligible entities An entity eligible to receive a grant under the program is— (1) a Federal, State, interstate, intermunicipal, or local governmental entity, agency, or instrumentality; (2) a Tribal government or consortium of Tribal governments; (3) a State infrastructure financing authority