Recursive fix, added grade support
Recursive fix, added grade support