wip - upgrade faraday
wip - add guard