=== Architecture Revised ===