refactoring, no flx-mode