Changed graphs to be more internally consistent.