Jhelbert/enrollment mode changes