Refactor to simplify graph transition part 2