Feature/nehalkhandelwal/bees 17