more work on the uploader