add client funct
merge prob
added client func
fixed merge