; (iii) has not had a major change in function or use since the previous evaluation and recommissioning or retrocommissioning; (iv) has been benchmarked with public disclosure under paragraph (8) during the preceding calendar year; and (v) (I) based on the benchmarking described in clause (iv), has achieved at a facility level the most recent cumulative energy savings target under subsection (a) compared to the earlier of— (aa) the date of the most recent evaluation; or (bb) the date— (AA) of the most recent commissioning, recommissioning, or retrocommissioning; or (BB) on which ongoing commissioning began; or (II) has a long-term contract in place guaranteeing energy savings at least as great as the energy savings target under subclause (I). (4) Implementation of identified energy and water efficiency measures Not later than 2 years after the date of completion of each evaluation under paragraph (3), each energy manager shall— (A) implement any energy- or water-saving measure that the Federal agency identified in the evaluation that is life cycle cost-effective; and (B) bundle individual measures of varying paybacks together into combined projects. ; (D) in paragraph (7)(B)(ii)(II), by inserting and water after energy ; and (E) in paragraph (9)(A), in the matter preceding clause (i), by inserting and water after energy . (b) Conforming amendment The table of contents for the National Energy Conservation Policy Act ( Public Law 95–619