separated the graph and updated everything to new versions