Added changes from work