refactoring nr1