Work on graph fix