Added death state handler