Updated to jason's current grade code