updated data model. Business logic is now working as expected