updated for s3