Updates based on work environment
Address changes for work environment