Really use the right uploader