Modified the S3 helper