eval function upgraged. GRADER updated