Added stuff from work