More work on rescue