Must handle FieldS3 as well :/