Modular: introduced overall controller #95