changed datamodel added 6a 6b pre questions