; and (B) by inserting after the first sentence the following: The contracting district or agency, not including contracting districts serving multiple agencies with separate governing boards, shall ensure that all contractor-owned water delivery systems within its boundaries measure surface water at the district or agency’s facilities up to the point the surface water is commingled with other water supplies. . (3) By striking subsection (d). (4) By redesignating subsections (e) and (f) as subsections (d) and (e), respectively. (5) By amending subsection (e) (as redesignated by paragraph (4))— (A) by striking as a result of the increased repayment and inserting that exceed the cost-of-service ; (B) by inserting the delivery of after rates applicable to ; and (C) by striking , and all increased revenues received by the Secretary as a result of the increased water prices established under subsection 3405(d) of this section, . 105. Fish, wildlife, and habitat restoration Section 3406 of the Central Valley Project Improvement Act (106 Stat. 4714) is amended as follows: (1) In subsection (b)— (A) in paragraph (1)(B)— (i) by striking is authorized and directed to and inserting may ; (ii) by inserting reasonable water after to provide ; (iii) by striking anadromous fish, except that such and inserting anadromous fish. Such ; (iv) by striking Instream flow and inserting Reasonable instream flow ; (v) by inserting and the National Marine Fisheries Service after United States Fish and Wildlife Service ; and (vi) by striking California Department of Fish and Game and inserting United States Geological Survey ; (B) in paragraph (2)— (i) by striking primary purpose and inserting purposes ; (ii) by striking but not limited to before additional obligations