Class 10/17. Expanded the controller.