Feature/rnair/bees 35