Refactoring. Added bees.