(Partial commit) Change graph basis