added grading and stats