added XCLIENT support