restructured data model using updated questions #2