Added caregiver checks