updated data model for next phase..