Updated with stuff from work env