Upgrades to grade controller