Bring in closer alignment with the archetype