addd bee, plus refactoring