Bear refactoring2