Improve rescue scenario