added grader with extra funcionality