Some code enhancement. Semester is now selectable