Improved rescue mode