Enrollment workflow changes

Enrollment workflow changes partial