refactor nabar