shooter: more changes for recovery