Switching over to working httpclient