updated to new uploader