Started to fix the graph