Added chnages to the controller