client minor enhancement