Reworked to use simple client.