Added kill switch