Set client (7/22)

Set client