Feature/apandey/bees 128