Progress on state machine