More changes in the config file
After merging