Getting rid of encodeURI, and changing up one example