move rescue to the better place