Initial changes for the nr version.