added graph
renaming stuff