diff --git a/python/biopro/devlib/library.py b/python/biopro/devlib/library.py
index 9904771..bb6394e 100644
--- a/python/biopro/devlib/library.py
+++ b/python/biopro/devlib/library.py
@@ -1130,6 +1130,11 @@ class CompletedDevice(Device):
                 self._parameter.set_parameter(name, value)
                 # raise RuntimeError('illegal parameter value : ' + value) from e
             else:
+                if name == 'MODE':
+                    if self.library_name.startswith('Elite_EDC'):
+                        self.set_parameter('CTRL_HIGH_Z_15', self.get_parameter('HIGHZ_TABLE')[value])
+                        self.set_parameter('TIME_DURATION', 0)
+
                 self._parameter.set_parameter(name, value)
 
         on_change = info.on_change
diff --git a/python/biopro/project/condition.py b/python/biopro/project/condition.py
index 5831a47..bb2bff4 100644
--- a/python/biopro/project/condition.py
+++ b/python/biopro/project/condition.py
@@ -93,7 +93,7 @@ class Condition():
     def previous_task_done(self, **kwargs):
         running_task = kwargs['running_task']
         self_task = kwargs['self_task']
-        if running_task != None and self_task != None:
+        # if running_task != None and self_task != None:
         # print('\nprevious_task_done: ', running_task.status, ' ', self._active)
         if running_task != self_task:
             if running_task == None:
diff --git a/python/res/devlib/json/Elite_EDC_1.5.devlib.json b/python/res/devlib/json/Elite_EDC_1.5.devlib.json
index 7f3ad29..2014251 100644
--- a/python/res/devlib/json/Elite_EDC_1.5.devlib.json
+++ b/python/res/devlib/json/Elite_EDC_1.5.devlib.json
@@ -15,6 +15,33 @@
     "BLE_WRITE_MAX": 255
   },
   "parameters": {
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
     "DPV_e_init": {
       "description": "DPV initial voltage ",
       "record_meta": true,
@@ -1081,7 +1108,7 @@
     "cali_Vout": {
       "type": "RIS",
       "parameter": {
-        "v": "DAC_VOLT_BUTTON" 
+        "v": "DAC_VOLT_BUTTON"
       },
       "data": [
         "XF1;B>ADC_DAC_CHANNEL_15;B>v"
diff --git a/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json b/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json
index 4baeb67..e79f772 100644
--- a/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json
+++ b/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json
@@ -15,6 +15,33 @@
     "BLE_WRITE_MAX": 255
   },
   "parameters": {
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
     "DPV_e_init": {
       "description": "DPV initial voltage ",
       "record_meta": true,
@@ -1081,7 +1108,7 @@
     "cali_Vout": {
       "type": "RIS",
       "parameter": {
-        "v": "DAC_VOLT_BUTTON" 
+        "v": "DAC_VOLT_BUTTON"
       },
       "data": [
         "XF1;B>ADC_DAC_CHANNEL_15;B>v"
diff --git a/python/res/devlib/json/Elite_EDC_1.5re.devlib.json b/python/res/devlib/json/Elite_EDC_1.5re.devlib.json
index 054635a..196b74e 100644
--- a/python/res/devlib/json/Elite_EDC_1.5re.devlib.json
+++ b/python/res/devlib/json/Elite_EDC_1.5re.devlib.json
@@ -15,6 +15,33 @@
     "BLE_WRITE_MAX": 255
   },
   "parameters": {
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
+    },
     "DPV_e_init": {
       "description": "DPV initial voltage ",
       "record_meta": true,
@@ -1081,7 +1108,7 @@
     "cali_Vout": {
       "type": "RIS",
       "parameter": {
-        "v": "DAC_VOLT_BUTTON" 
+        "v": "DAC_VOLT_BUTTON"
       },
       "data": [
         "XF1;B>ADC_DAC_CHANNEL_15;B>v"