; (ii) the use of woodland for agroforestry, including forest farming, multistory cropping, and related production practices, as determined by the Secretary; and (iii) the use of cropland for perennial forages or perennial grain crops. ; (C) in paragraph (2)— (i) in subparagraph (A), by striking or at the end; (ii) in subparagraph (B), by striking the period at the end and inserting ; or ; and (iii) by adding at the end the following: (C) a perennial production system. ; and (D) in paragraph (3), by striking or advanced grazing management and inserting , advanced grazing management, or a perennial production system . (4) Payment for comprehensive conservation plan Section 1240L(e)(1) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–24(e)(1) ) is amended— (A) by striking the period at the end and inserting the following: “; and (B) with respect to an organic production system— (i) is integrated with an organic system plan approved under the national organic program established under the Organic Foods Production Act of 1990 ( 7 U.S.C. 6501 et seq. ); or (ii) allows a producer to transition to organic production systems and pursue certification under that Act. ; and (B) in the matter preceding subparagraph (B) (as added by subparagraph (A)), by striking plan that meets and inserting the following: “plan that— (A) meets . (5) Payment limitations Section 1240L(f) of the Food Security Act of 1985 ( 16 U.S.C. 3839aa–24(f) ) is amended— (A) by inserting (including a joint venture and a general partnership) after A person or legal entity