Added grader and check