; and (3) by adding at the end the following: (D) water-conserving practices such as dryland farming; (E) improvement of the storage of water through measures such as water banking and groundwater recharge; or (F) enhancement of fish and wildlife habitat associated with irrigation systems, including pivot corners and areas with irregular boundaries. . (g) Payments for conservation practices related to organic production (1) Payments authorized Section 1240B(i)(1) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–2(i)(1) ) is amended by striking subsection and inserting chapter . (2) Eligibility requirements Section 1240B(i)(2) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–2(i)(2) ) is amended to read as follows: (2) Eligibility requirements As a condition for receiving payments under this subsection, a producer shall agree to develop and implement conservation practices for certified organic production that are consistent with the regulations promulgated under the Organic Foods Production Act of 1990 ( 7 U.S.C. 6501 et seq. ) and the purposes of this chapter. . (3) Payment limitations; coordination with organic certification; planning Section 1240B(i) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–2(i) ) is amended— (A) by striking paragraph (3) and redesignating paragraphs (4) and (5) as paragraphs (5) and (6), respectively