Modified grader and checks