some changes to upload-server