Adding in APO controller.