refactor nabar 2x