Added Kill switch