Cleaning up the FSM to use an explicity intercept state transition