Updated controller design
Updated controller design
Architectural update