Updated with latest settings from work machine