Updated KillSwitch