More changes from work