Upgrade to Architect 3