switched to entity-based rendering