Graphs now working correctly