; (2) in subsection (a)— (A) in the matter preceding paragraph (1), by striking supplies and inserting management ; (B) in paragraph (1), by inserting and water supply entities after owners ; and (C) in paragraph (2)— (i) in subparagraph (A), by inserting that choose not to participate or opt out of tributary enhancement projects pursuant to this section after water right owners ; and (ii) in subparagraph (B), by inserting nonparticipating before tributary water users ; (3) in subsection (b)— (A) in paragraph (1)— (i) by striking the paragraph designation and all that follows through (but not limited to)— and inserting the following: (1) In general The Secretary, following consultation with the State of Washington, tributary water right owners, and the Yakama Nation, and on agreement of appropriate water right owners, is authorized to conduct studies to evaluate measures to further Yakima Project purposes on tributaries to the Yakima River. Enhancement programs that use measures authorized by this subsection may be investigated and implemented by the Secretary in tributaries to the Yakima River, including Taneum Creek, other areas, or tributary basins that currently or could potentially be provided supplemental or transfer water by entities, such as the Kittitas Reclamation District or the Yakima-Tieton Irrigation District, subject to the condition that activities may commence on completion of applicable and required feasibility studies, environmental reviews, and cost-benefit analyses that include favorable recommendations for further project development, as appropriate. Measures to evaluate include— ; (ii) by indenting subparagraphs (A) through (F) appropriately; (iii) in subparagraph (A), by inserting before the semicolon at the end the following: , including irrigation efficiency improvements (in coordination with programs of the Department of Agriculture), consolidation of diversions or administration, and diversion scheduling or coordination