Rework uploading process