Adding in consideration of max course pref
Fixing Jarred's Course issue again...