fixed
updated the data model