Changed Subject to GradeCalculator