Changes for the controller