updated to Architect 2.2