; (II) by inserting and water after energy ; and (III) by inserting and water after electricity ; (ii) in the second sentence, by inserting and water after electricity ; and (iii) in the fourth sentence, by inserting and water after energy ; (C) in paragraph (2)— (i) in subparagraph (A)— (I) by striking and before Federal ; and (II) by inserting and any other person the Secretary deems necessary, before shall ; (ii) in subparagraph (B)— (I) by amending clause (i)(II) to read as follows: (II) the extent to which metering is expected to result in increased potential for energy and water management, increased potential for energy and water savings, energy and water efficiency improvements, and cost, energy, and water savings due to utility contract aggregation; and ; (II) in clause (ii), by inserting and water after energy ; and (III) in clause (iv), by inserting and water after energy ; and (iii) by adding at the end the following: (C) Update Not later than 180 days after the date of enactment of this subparagraph, the Secretary shall update the guidelines established under subparagraph (A) to take into account water efficiency requirements under this section. ; (D) in paragraph (3), in the matter preceding subparagraph (A), by striking established under paragraph (2) and inserting updated under paragraph (2)(C) ; and (E) in paragraph (4)— (i) in subparagraph (A)— (I) by striking this paragraph and inserting the Federal Energy and Water Management Performance Act of 2020 ; and (II) by inserting and water before use in ; and (ii) in subparagraph (B)(ii), in the matter preceding clause (I), by inserting and water after energy ; (7) in subsection (f)— (A) in paragraph (1)(B)(i)(II), by inserting and water after energy ; (B) in paragraph (2)— (i) in subparagraph (A), by inserting and water before use ; and (ii) in subparagraph (B)— (I) by striking energy before efficiency ; and (II) by inserting or water before use ; (C) in paragraph (7)(B)(ii)(II), by inserting and water after energy