s3 setup changes