refactor, bb up