updated to new datamodel