Improving Run and Death stuff