Adding improved grader.js