Graeson- In class fix