Feature/nehalkhandelwal/bees 97