WIP state machine updates