Update to make the "died" universal, fixed partials