small changes in singleEntity.