Feature/rnair/bees 10