Added a kill switch