changes to s3 based on engineer feedback