; and (5) by amending subsection (g) to read as follows: (g) Allocation of funds (1) Fiscal year 2018 Subject to subsection (h), the Administrator shall use the amounts appropriated to carry out this section for fiscal year 2018 for making grants to municipalities and municipal entities under subsection (a)(2) in accordance with the criteria set forth in subsection (b). (2) Fiscal year 2019 and thereafter Subject to subsection (h), the Administrator shall use the amounts appropriated to carry out this section for fiscal year 2019 and each fiscal year thereafter for making grants to States under subsection (a)(1) in accordance with a formula to be established by the Administrator, after providing notice and an opportunity for public comment, that allocates to each State a proportional share of such amounts based on the total needs of the State for municipal combined sewer overflow controls, sanitary sewer overflow controls, and stormwater identified in the most recent survey conducted pursuant to section 516 and any other information the Administrator considers appropriate. .