Updated for s3