Merged from old changes from usb stick