No More cUrl
merge conflict