Quick rework of the default controller.