; (C) conversion of the agricultural operation to— (i) the production of less water-intensive agricultural commodities; or (ii) dryland farming; (D) improvement of the storage of water through measures such as water banking and groundwater recharge; (E) enhancement of fish and wildlife habitat associated with irrigation systems, including pivot corners and areas with irregular boundaries; (F) enhancement of frost protection methods to— (i) mitigate damage to fish and wildlife habitat; (ii) enhance water efficiency; or (iii) promote alternative frost protection methods that do not rely on ground and surface water; and (G) establishment of other measures, as determined by the Secretary, that improve groundwater and surface water conservation in agricultural operations. . (2) Priority Section 1240B(h)(2) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–2(h)(2) ) is amended— (A) in subparagraph (A), by striking ; or and inserting ; and