updated configs
Merged changes