radical refactor #2