More improvements to new upload method