Improve the state machine.