; 5 U.S.C. 5702 note) is amended— (1) by striking Definition .—In this section, the term and inserting the following: “Definitions .—In this section: (1) The term ; and (2) by adding at the end the following new paragraph: (2) The term general public includes the Federal Government or an agency. . D Disability Pay, Retired Pay, and Survivor Benefits 631. Contributions to Department of Defense Military Retirement Fund based on pay costs per Armed Force rather than on Armed Forces-wide basis (a) Determination of contributions generally Section 1465(c) of title 10, United States Code, is amended— (1) in paragraph (1)— (A) in subparagraph (A), by striking single level percentage of basic pay for active duty (other than the Coast Guard) and for full-time National Guard duty and inserting percentage of basic pay for each armed force (other than the Coast Guard) and for any full-time National Guard duty ; (B) in subparagraph (B)— (i) by striking single level ; and (ii) by striking members of the Selected Reserve of the armed forces (other than the Coast Guard) and inserting each armed force (other than the Coast Guard) for members of the Selected Reserve ; and (C) in the flush matter following subparagraph (B), by striking single level ; and (2) in paragraph (4)— (A) by striking a single level percentage determined both places it appears and inserting percentages ; and (B) in the flush matter following subparagraph (B), by striking single level . (b) Conforming amendments (1) Determination of contributions Section 1465(b) of title 10, United States Code, is amended— (A) in paragraph (1)— (i) in subparagraph (A)— (I) in the matter preceding clause (i), by striking product and inserting aggregate of the products ; (II) in clause (i), by striking single level percentage of basic pay and inserting percentage of basic pay for each armed force (other than the Coast Guard)