Modified client to work with new server.