Finish 11.1.1 A problem with the data model (and a solution)