Updated codebase cnr