now using new entity type.