added enroll check