slight change in naming of fields