Kindly migrate client code

1 out of 2