Improved upload