Enrollment remaining changes

Enrollment remaining changes