Added catch state machine