More state machine changes.