modyfied grader.fs