Set client (6/22)

Set client