Added option for course selection