finished DeadEvent changes