changed config update code
merge