Makes it work with S3