more work on the entity data