; and (2) by striking the language of the section and by adding: (a) Renewal of existing long-Term contracts Upon request of the contractor, the Secretary shall renew any existing long-term repayment or water service contract that provides for the delivery of water from the Central Valley Project for a period of 40 years. (b) Administration of Contracts Except as expressly provided by this Act, any existing long-term repayment or water service contract for the delivery of water from the Central Valley Project shall be administered pursuant to the Act of July 2, 1956 (70 Stat. 483). (c) Delivery charge Beginning on the date of the enactment of this Act, a contract entered into or renewed pursuant to this section shall include a provision that requires the Secretary to charge the other party to such contract only for water actually delivered by the Secretary. . 104. Water transfers, improved water management, and conservation Section 3405 of the Central Valley Project Improvement Act (106 Stat. 4709) is amended as follows: (1) In subsection (a)— (A) by inserting before Except as provided herein the following: The Secretary shall take all necessary actions to facilitate and expedite transfers of Central Valley Project water in accordance with this Act or any other provision of Federal reclamation law and the National Environmental Policy Act of 1969. ; (B) in paragraph (1)(A), by striking to combination and inserting or combination