removed unused graph, changed names
so on