Client improved