merge with S3 version