Updated with grading timeline