== **Architecture Revised** ----