More restructuring, close to node analysis coloring.