incorporated new data model