Updated Controller.