Added grading, added manage user