This amendment adds $450,000 the first year from the general fund and language directing the Department of Behavioral Health and Developmental Services to develop a comprehensive plan for the publicly funded geropsychiatric system of care in Virginia and sets out requirements for the plan, including an assessment of the needs of individuals residing in state geropsychiatric facilities, as well as community capacity to meet their treatment needs. The plan shall be presented to the Governor and the Chairmen of the House Appropriations and Senate Finance Committees as well as the Chairman of the Joint Subcommittee to Study Mental Health Services in the Twenty-First Century by November 15, 2016. A companion amendment eliminates funding and development of a plan to close Catawba Hospital.