Major changeds to get statement and the graph working