Updated state switching to most recent state machine rev