Changes to support IS-NP plotting that were not committed