added controller.stop() back in