Feature/nehalkhandelwal/bees 123