Continued working on Enrollment