Slight adjustments on state transition graph.