Grading updated and improved (no paging)