Updated from work
Updated config