some fuuki refactoring (nw)