various changes from work