Update new GradeCalculator