Added checks and autograder