Added some logic to CourseSelector