changed carrier wave for S3