some changes from work