working on graph fix