update to rescues around lifecycle events