diff --git a/python/adapters/openolt/openolt.py b/python/adapters/openolt/openolt.py
index 9c5f799..7e1a3e6 100644
--- a/python/adapters/openolt/openolt.py
+++ b/python/adapters/openolt/openolt.py
@@ -57,7 +57,7 @@
         DeviceType(
             id=name,
             adapter=name,
-            accepts_bulk_flow_update=True,
+            accepts_bulk_flow_update=False,
             accepts_add_remove_flow_updates=True
         )
     ]
@@ -227,14 +227,17 @@
         log.debug('flows and grousp details', flows=flows, groups=groups)
         assert len(groups.items) == 0, "Cannot yet deal with groups"
         handler = self.devices[device.id]
-        return handler.update_flow_table(flows.items)
+        handler.update_flow_table(flows.items)
+
+        return device
 
     def update_flows_incrementally(self, device, flow_changes, group_changes):
         log.debug('update_flows_incrementally', device=device,
                   flow_changes=flow_changes, group_changes=group_changes)
-        log.info('This device does not allow this, therefore it is Not '
-                 'implemented')
-        raise NotImplementedError()
+        handler = self.devices[device.id]
+        handler.update_flow_table(flow_changes)
+
+        return device
 
     def update_logical_flows(self, device_id, flows_to_add, flows_to_remove,
                              groups, device_rules_map):