Merge with juli's usb