updates to conf from work