serious changes to the datamodel