added kill switch