[Suggestion] Kill-Arrest rework