Re: Improvement to rescue mode?