Updating to get rid of s3