super fast refactor