added enrolment check