Bear refactoring1