Modified to use s3_file