Feature/rnair/bees 9