A little more completion on the client