Made the graph better and more robust.