Changing to use HttpClient