lots of changes to classify; s3 handling