More changes to controllers