Modified uploader