Updating to BS3 plus CANIs