added some S3 stuff