added selectors
added grader again