V1.2 added client code