David, new uriParse code