More changes to Refresh controller