Adjust S3 again