Changes from nr2