Feature/nehalkhandelwal/bees 8