; and (B) has not entered into a contract, agreement, or other arrangement for such individual to act as a caregiver for that veteran unless such individual is a family member of the veteran or is furnishing caregiver services through a medical foster home. . (b) Deadline for improved administration The Secretary of Veterans Affairs shall ensure that the Veteran-Directed Care program and the Homemaker and Home Health Aide program are administered through each medical center of the Department of Veterans Affairs in accordance with section 1720K of title 38, United States Code (as added by subsection (a)), by not later than two years after the date of the enactment of this Act. 5. Coordination with assistance and support services for caregivers (a) Coordination with Program of Comprehensive Assistance for Family Caregivers (1) Coordination Section 1720G(a) of title 38, United States Code, is amended by adding at the end the following new paragraph: (14) (A) In the case of a veteran or caregiver who seeks services under this subsection and is denied such services, or a veteran or the family caregiver of a veteran who is discharged from the program under this subsection, the Secretary shall— (i) if the veteran meets the requirements of a covered veteran under subsection (b), provide to such caregiver the option of enrolling in the program of general caregiver support services under such subsection; (ii) assess the veteran or caregiver for participation in any other available program of the Department for home- and community-based services (including the programs specified in section 1720K of this title) for which the veteran or caregiver may be eligible and, with respect to the veteran, store (and make accessible to the veteran) the results of such assessment in the electronic medical record of the veteran