edits to restclient to httpclient