work on the entity part