Replaced the other http requests as well