Adding Kill Switches