changed the data model