Modified code to use 2 HttpClients

#1908