AzureSDKAutomation
diff --git a/‎sdk/eventhub/azure-eventhubs/HISTORY.md
+4 b/‎sdk/eventhub/azure-eventhubs/HISTORY.md
+4
diff --git a/‎sdk/eventhub/azure-eventhubs/README.md
+11-12 b/‎sdk/eventhub/azure-eventhubs/README.md
+11-12
diff --git a/‎sdk/eventhub/azure-eventhubs/azure/eventhub/__init__.py
+11-5 b/‎sdk/eventhub/azure-eventhubs/azure/eventhub/__init__.py
+11-5
@@ -1,5 +1,9 @@
 # Release History
 
+## 2019-11-04 5.0.0b6
+
+**Breaking changes**
+
 ## 2019-11-04 5.0.0b5
 
 **Breaking changes**
 
@@ -189,13 +189,13 @@ client = EventHubConsumerClient.from_connection_string(connection_str, event_hub
 
 logger = logging.getLogger("azure.eventhub")
 
-def on_events(partition_context, events):
-    logger.info("Received {} events from partition {}".format(len(events), partition_context.partition_id))
+def on_event(partition_context, event):
+    logger.info("Received event from partition {}".format(partition_context.partition_id))
 
 with client:
-    client.receive(on_events=on_events, consumer_group="$Default")
+    client.receive(on_event=on_event, consumer_group="$Default")
     # receive events from specified partition:
-    # client.receive(on_events=on_events, consumer_group="$Default", partition_id='0')
+    # client.receive(on_event=on_event, consumer_group="$Default", partition_id='0')
 ```
 
 ### Async publish events to an Event Hub
@@ -273,15 +273,15 @@ event_hub_path = '<< NAME OF THE EVENT HUB >>'
 
 logger = logging.getLogger("azure.eventhub")
 
-async def on_events(partition_context, events):
-    logger.info("Received {} events from partition {}".format(len(events), partition_context.partition_id))
+async def on_event(partition_context, event):
+    logger.info("Received event from partition {}".format(partition_context.partition_id))
 
 async def receive():
     client = EventHubConsumerClient.from_connection_string(connection_str, event_hub_path=event_hub_path)
     async with client:
-        received = await client.receive(on_events=on_events, consumer_group='$Default')
+        received = await client.receive(on_event=on_event, consumer_group='$Default')
         # receive events from specified partition:
-        # received = await client.receive(on_events=on_events, consumer_group='$Default', partition_id='0')
+        # received = await client.receive(on_event=on_event, consumer_group='$Default', partition_id='0')
 
 if __name__ == '__main__':
     loop = asyncio.get_event_loop()
@@ -330,13 +330,12 @@ async def do_operation(event):
     print(event)
 
 
-async def process_events(partition_context, events):
-    await asyncio.gather(*[do_operation(event) for event in events])
-    await partition_context.update_checkpoint(events[-1])
+async def process_event(partition_context, event):
+    await partition_context.update_checkpoint(event)
 
 async def receive(client):
     try:
-        await client.receive(on_events=process_events, consumer_group="$Default")
+        await client.receive(on_event=process_event, consumer_group="$Default")
     except KeyboardInterrupt:
         await client.close()
 
 
@@ -4,17 +4,23 @@
 # --------------------------------------------------------------------------------------------
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore
-__version__ = "5.0.0b5"
+__version__ = "5.0.0b6"
 from uamqp import constants  # type: ignore
-from .common import EventData, EventDataBatch, EventPosition
-from .error import EventHubError, EventDataError, ConnectError, \
-    AuthenticationError, EventDataSendError, ConnectionLostError
+from ._common import EventData, EventDataBatch, EventPosition
 from ._producer_client import EventHubProducerClient
 from ._consumer_client import EventHubConsumerClient
-from .common import EventHubSharedKeyCredential, EventHubSASTokenCredential
+from ._common import EventHubSharedKeyCredential, EventHubSASTokenCredential
 from ._eventprocessor.partition_manager import PartitionManager
 from ._eventprocessor.common import CloseReason, OwnershipLostError
 from ._eventprocessor.partition_context import PartitionContext
+from .exceptions import (
+    EventHubError,
+    EventDataError,
+    ConnectError,
+    AuthenticationError,
+    EventDataSendError,
+    ConnectionLostError
+)
 
 TransportType = constants.TransportType