more data model / question changes