updated tweaking of client mode