Complete the client part