better death handling