modify Activity and EnrollController,sounds good