Update with killswitch added