updated for better s3 file naming