Complete the client