Implemented course selection