Improved Graph, minor changes