Restructured controller