more surgery on the data model