More work on decoupling controllers