switch to new archetype integration system
merged