Graphs now get the right values