switch to using grade