updated data model, notes