Revamp
Fixed merge
Changed url to baseurl