Added checks and grader as-is