More changes to controller