Completed all the graph, only some code modification required