two more changes to new data model