updated the controller and messages