S3 upload improved