Updated config file
Merged changes