simplified the entity system