updated config
updated client-server