updates to try get graphs working better