Upgrade state machine to version, looking like working