updated with changes from work