Adding changes from the config from old system
Merge occured diversion.