merges in some changes from work machine