moved kill switch changes here