Added changes to some of the controllers