1.22 - better USB support