added s3 changes