Changes to tub_s3