Highschool fixes.
Merge remote-tracking branch 'origin/feature_LdShake' into feature_LdShake