Changed AWS back to S3