updated few client changes
merge conflicts