Converting to use v-usb