diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json
index 2b5224b..71f753c 100644
--- a/lib/obp60task/config.json
+++ b/lib/obp60task/config.json
@@ -726,7 +726,7 @@
         "condition": [
             { "calInstance1": "AWA" },
             { "calInstance1": "AWS" },
-            { "calInstance2": "COG" },
+            { "calInstance1": "COG" },
             { "calInstance1": "DBT" },
             { "calInstance1": "HDM" },
             { "calInstance1": "PRPOS" },
@@ -751,7 +751,7 @@
         "condition": [
             { "calInstance1": "AWA" },
             { "calInstance1": "AWS" },
-            { "calInstance2": "COG" },
+            { "calInstance1": "COG" },
             { "calInstance1": "DBT" },
             { "calInstance1": "HDM" },
             { "calInstance1": "PRPOS" },
@@ -779,7 +779,7 @@
         "condition": [
             { "calInstance1": "AWA" },
             { "calInstance1": "AWS" },
-            { "calInstance2": "COG" },
+            { "calInstance1": "COG" },
             { "calInstance1": "DBT" },
             { "calInstance1": "HDM" },
             { "calInstance1": "PRPOS" },
@@ -1285,8 +1285,6 @@
             "obp60":"true"
         }
     },
- 
-    
     {
         "name": "page1type",
         "label": "Type",
diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json
index 1817e64..1afb168 100644
--- a/lib/obp60task/config_obp40.json
+++ b/lib/obp60task/config_obp40.json
@@ -707,10 +707,12 @@
             "---",
             "AWA",
             "AWS",
+            "COG",
             "DBT",
             "HDM",
             "PRPOS",
             "RPOS",
+            "SOG",
             "STW",
             "TWA",
             "TWS",
@@ -730,8 +732,22 @@
         "description": "Offset for data instance 1",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance1": "AWA" },
+            { "calInstance1": "AWS" },
+            { "calInstance1": "COG" },
+            { "calInstance1": "DBT" },
+            { "calInstance1": "HDM" },
+            { "calInstance1": "PRPOS" },
+            { "calInstance1": "RPOS" },
+            { "calInstance1": "SOG" },
+            { "calInstance1": "STW" },
+            { "calInstance1": "TWA" },
+            { "calInstance1": "TWS" },
+            { "calInstance1": "TWD" },
+            { "calInstance1": "WTemp" } ]
     },
     {
         "name": "calSlope1",
@@ -741,8 +757,22 @@
         "description": "Slope for data instance 1",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance1": "AWA" },
+            { "calInstance1": "AWS" },
+            { "calInstance1": "COG" },
+            { "calInstance1": "DBT" },
+            { "calInstance1": "HDM" },
+            { "calInstance1": "PRPOS" },
+            { "calInstance1": "RPOS" },
+            { "calInstance1": "SOG" },
+            { "calInstance1": "STW" },
+            { "calInstance1": "TWA" },
+            { "calInstance1": "TWS" },
+            { "calInstance1": "TWD" },
+            { "calInstance1": "WTemp" }  ]
     },
     {
         "name": "calSmooth1",
@@ -752,11 +782,25 @@
         "check": "checkMinMax",
         "min": 0,
         "max": 10,
-        "description": "Smoothing factor for data instance 1",
+        "description": "Smoothing factor [0..10]; 0 = no smoothing",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance1": "AWA" },
+            { "calInstance1": "AWS" },
+            { "calInstance1": "COG" },
+            { "calInstance1": "DBT" },
+            { "calInstance1": "HDM" },
+            { "calInstance1": "PRPOS" },
+            { "calInstance1": "RPOS" },
+            { "calInstance1": "SOG" },
+            { "calInstance1": "STW" },
+            { "calInstance1": "TWA" },
+            { "calInstance1": "TWS" },
+            { "calInstance1": "TWD" },
+            { "calInstance1": "WTemp" }  ]
     },
     {
         "name": "calInstance2",
@@ -768,10 +812,12 @@
             "---",
             "AWA",
             "AWS",
+            "COG",
             "DBT",
             "HDM",
             "PRPOS",
             "RPOS",
+            "SOG",
             "STW",
             "TWA",
             "TWS",
@@ -791,8 +837,22 @@
         "description": "Offset for data instance 2",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance2": "AWA" },
+            { "calInstance2": "AWS" },
+            { "calInstance2": "COG" },
+            { "calInstance2": "DBT" },
+            { "calInstance2": "HDM" },
+            { "calInstance2": "PRPOS" },
+            { "calInstance2": "RPOS" },
+            { "calInstance2": "SOG" },
+            { "calInstance2": "STW" },
+            { "calInstance2": "TWA" },
+            { "calInstance2": "TWS" },
+            { "calInstance2": "TWD" },
+            { "calInstance2": "WTemp" } ]
     },
     {
         "name": "calSlope2",
@@ -802,8 +862,22 @@
         "description": "Slope for data instance 2",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance2": "AWA" },
+            { "calInstance2": "AWS" },
+            { "calInstance2": "COG" },
+            { "calInstance2": "DBT" },
+            { "calInstance2": "HDM" },
+            { "calInstance2": "PRPOS" },
+            { "calInstance2": "RPOS" },
+            { "calInstance2": "SOG" },
+            { "calInstance2": "STW" },
+            { "calInstance2": "TWA" },
+            { "calInstance2": "TWS" },
+            { "calInstance2": "TWD" },
+            { "calInstance2": "WTemp" } ]
     },
     {
         "name": "calSmooth2",
@@ -813,11 +887,25 @@
         "check": "checkMinMax",
         "min": 0,
         "max": 10,
-        "description": "Smoothing factor for data instance 2",
+        "description": "Smoothing factor [0..10]; 0 = no smoothing",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance2": "AWA" },
+            { "calInstance2": "AWS" },
+            { "calInstance2": "COG" },
+            { "calInstance2": "DBT" },
+            { "calInstance2": "HDM" },
+            { "calInstance2": "PRPOS" },
+            { "calInstance2": "RPOS" },
+            { "calInstance2": "SOG" },
+            { "calInstance2": "STW" },
+            { "calInstance2": "TWA" },
+            { "calInstance2": "TWS" },
+            { "calInstance2": "TWD" },
+            { "calInstance2": "WTemp" } ]
     },
     {
         "name": "calInstance3",
@@ -829,10 +917,12 @@
             "---",
             "AWA",
             "AWS",
+            "COG",
             "DBT",
             "HDM",
             "PRPOS",
             "RPOS",
+            "SOG",
             "STW",
             "TWA",
             "TWS",
@@ -852,8 +942,22 @@
         "description": "Offset for data instance 3",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance3": "AWA" },
+            { "calInstance3": "AWS" },
+            { "calInstance3": "COG" },
+            { "calInstance3": "DBT" },
+            { "calInstance3": "HDM" },
+            { "calInstance3": "PRPOS" },
+            { "calInstance3": "RPOS" },
+            { "calInstance3": "SOG" },
+            { "calInstance3": "STW" },
+            { "calInstance3": "TWA" },
+            { "calInstance3": "TWS" },
+            { "calInstance3": "TWD" },
+            { "calInstance3": "WTemp" } ]
     },
     {
         "name": "calSlope3",
@@ -863,8 +967,22 @@
         "description": "Slope for data instance 3",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance3": "AWA" },
+            { "calInstance3": "AWS" },
+            { "calInstance3": "COG" },
+            { "calInstance3": "DBT" },
+            { "calInstance3": "HDM" },
+            { "calInstance3": "PRPOS" },
+            { "calInstance3": "RPOS" },
+            { "calInstance3": "SOG" },
+            { "calInstance3": "STW" },
+            { "calInstance3": "TWA" },
+            { "calInstance3": "TWS" },
+            { "calInstance3": "TWD" },
+            { "calInstance3": "WTemp" } ]
     },
     {
         "name": "calSmooth3",
@@ -874,11 +992,25 @@
         "check": "checkMinMax",
         "min": 0,
         "max": 10,
-        "description": "Smoothing factor for data instance 3",
+        "description": "Smoothing factor [0..10]; 0 = no smoothing",
         "category": "OBP40 Calibrations",
         "capabilities": {
-            "obp40": "true"
-        }
+            "obp40":"true"
+        },
+        "condition": [
+            { "calInstance3": "AWA" },
+            { "calInstance3": "AWS" },
+            { "calInstance3": "COG" },
+            { "calInstance3": "DBT" },
+            { "calInstance3": "HDM" },
+            { "calInstance3": "PRPOS" },
+            { "calInstance3": "RPOS" },
+            { "calInstance3": "SOG" },
+            { "calInstance3": "STW" },
+            { "calInstance3": "TWA" },
+            { "calInstance3": "TWS" },
+            { "calInstance3": "TWD" },
+            { "calInstance3": "WTemp" } ]
     },
     {
         "name": "display",
@@ -3842,3 +3974,4 @@
         ]
     }
 ]
+