; (4) in subsection (g)— (A) in paragraph (9) by striking and at the end; (B) by redesignating paragraph (10) as paragraph (12); and (C) by adding after paragraph (9) the following: (10) the extent to which the State or local government has facilitated the adoption and enforcement of the latest published editions of relevant consensus-based codes, specifications, and standards that incorporate the latest hazard-resistant designs and establish criteria for the design, construction, and maintenance of residential structures and facilities that may be eligible for assistance under this Act for the purpose of protecting the health, safety, and general welfare of the buildings’ users against disasters; and (11) the extent to which the assistance will fund activities that increase the level of resiliency; and ; (5) by striking subsection (i) and inserting the following: (i) National public infrastructure predisaster mitigation fund (1) Establishment The President shall establish in the Treasury of the United States a separate account called the National Public Infrastructure Predisaster Mitigation Fund (in this section referred to as the Predisaster Mitigation Fund ), which shall be used exclusively to carry out this section, with amounts in such account to be available until expended unless otherwise provided. (2) Transfers to predisaster mitigation fund (A) In general There shall be deposited in the Predisaster Mitigation Fund with respect to each disaster declared on or after August 1, 2017, an additional amount equal to 6 percent of the estimated aggregate amount of grants to be made pursuant to sections 403, 406, 407, 408, 410, and 416. (B) Estimated aggregate amount Not later than 180 days after each major disaster declaration, the estimated aggregate amount of grants on which the amount calculated in subparagraph (A) is based shall be determined and need not be reduced, increased, or changed due to variations in estimates.