Changes to nnmatthew and nnplotsigp - check søren