Included changes from work