=fix the data model