some client changes
merged