changed the class structure...

...so that it works with grader