added different entities and points