Adjusted state machine