Architectural update #2