Updated config
Merged