Modified to fit with StudyPlan web