Revised grader.js