updates following on from ISI5-509 (use of undocumented API).