Changes to controller