; 10 U.S.C. 2871 note) is amended by striking subsection (a). (2) Effective date The amendment made by paragraph (1) shall take effect on the date of the enactment of this Act, and shall apply with respect to months beginning on or after that date. (b) Use of funds in connection with MHPI (1) In general Each month beginning with the first month after the date of the enactment of this Act, each Secretary of a military department shall do the following: (A) Payments to lessors Use funds, in an amount calculated pursuant to paragraph (2)(A), for payments to lessors of covered housing in the manner provided by subsection (a) of section 606 of the John S. McCain National Defense Authorization Act for Fiscal Year 2019, as in effect on the day before the date of the enactment of this Act. (B) Improvement of oversight and management of agreements Use funds, in an amount calculated pursuant to paragraph (2)(B), for improvements of the oversight and management of agreements for MHPI housing under the jurisdiction of such Secretary. (2) Monthly amounts (A) For payments to lessors The amount calculated for a military department for a month pursuant to this subparagraph is 2 percent of the aggregate of the amounts calculated under section 403(b)(3)(A)(i) of title 37, United States Code, for covered housing under the jurisdiction of such department for such month. (B) For improvement of oversight and management of agreements The amount calculated for a military department for a month pursuant to this subparagraph is 3 percent of the aggregate of the amounts calculated under section 403(b)(3)(A)(i) of title 37, United States Code, for covered housing under the jurisdiction of such department for such month. (3) Improvements Improvements under paragraph (1)(B) to the oversight and management of agreements described in that paragraph may include the following: (A) Assignment of additional civilian personnel to perform oversight and management functions with respect to such agreements. (B) Investment in technological mechanisms to