Enhanced grader to work with url