Re client (9/40)

Re client