Updated to fix controller.