; and (2) by adding at the end the following new subsection: (jj) Increased FMAP for additional expenditures for mental health and behavioral health services (1) In general Notwithstanding subsection (b), with respect to the portion of the amounts expended for medical assistance for services described in section 1902(a)(13)(D) furnished on or after October 1, 2024, and before October 1, 2028, that is attributable to the amount by which the minimum payment rate required under such section (or, by application, section 1932(f)) exceeds the payment rate applicable to such services under the State plan or a waiver of such plan as of July 1, 2024, the Federal medical assistance percentage for a State shall be equal to 100 percent. The preceding sentence shall not be construed as prohibiting the payment of Federal financial participation based on the Federal medical assistance percentage for the portion of the amounts expended for medical assistance for such services that is attributable to the amount (if any) by which the payment rate applicable to such services under the State plan or waiver exceeds such minimum payment rate. (2) Disregard of enhanced payments for purposes of territorial limits The amount of any payment made for expenditures on medical assistance that is attributable to the application of the Federal medical assistance percentage described in paragraph (1) shall not be taken into account for purposes of applying payment limits under subsections (f) and (g) of section 1108. . 10. CMI demonstration to test the provision of recovery housing for individuals with opioid use disorder under Medicaid Section 1115A of the Social Security Act ( 42 U.S.C. 1315a ) is amended— (1) in subsection (b)(2)(A), by adding at the end the following new sentence: The models selected under this subparagraph shall include the demonstration described in subsection (h) (which shall be implemented not later than 18 months after the date of enactment of such subsection).