There was an updated Disney Zorro show in the late 80s/early 90s, too, correct? He grooms a replacement and they moved the timeline forward a bit from the traditional Zorro eras.
Also, NBC has a new Zorro coming out with a female descendant taking over in a more modern setting. Is that still going on?