More changes to the controllers