client related changes