diff --git a/VERSION b/VERSION
index 227cea2..c10edc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.1.0-dev
diff --git a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
index 898d58b..ca6c7ef 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -719,9 +719,10 @@
 
             self.disable_ports(onu_device)
             onu_device.reason = "stopping-openomci"
+            yield self.core_proxy.device_update(onu_device)
             onu_device.connect_status = ConnectStatus.UNREACHABLE
             onu_device.oper_status = OperStatus.DISCOVERED
-            yield self.core_proxy.device_update(onu_device)
+            yield self.core_proxy.device_state_update(self.device_id, onu_device.oper_status,onu_device.connect_status)
         else:
             self.log.debug('not-changing-openomci-statemachine')
 
@@ -992,6 +993,7 @@
                     self.log.info('mib-download-success', _results=_results)
                     device = yield self.core_proxy.get_device(self.device_id)
                     device.reason = 'initial-mib-downloaded'
+                    yield self.enable_ports(device)
                     yield self.core_proxy.device_state_update(device.id,
                                             oper_status=OperStatus.ACTIVE, connect_status=ConnectStatus.REACHABLE)
                     yield self.core_proxy.device_update(device)