NS32k changes from Ian Dall: