Let's rewrite all the entities.. again