Added missing state machine