need to fix recovery behaviors