TW Properly fix Death and Decay once and for all