modified for data model changes