Added de_upper_school functions, enhanced grade_system