Feature/ubhavsar/bees 16