Some changes from work