Added grader & checks