graph change. Will be removed tho
changes after merge
merge fixes to graph and others