Graphs have been added and work well enough