updates from work

updates from work