With new state machine