additional tweeking of client