Non-hibernating bear is now fatal. Some refactoring