diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json
index e24e9e9..2c8b0f3 100644
--- a/lib/obp60task/config_obp40.json
+++ b/lib/obp60task/config_obp40.json
@@ -701,6 +701,189 @@
             "obp40": "true"
         }
     },
+    {
+        "name": "calInstance1",
+        "label": "Calibration Data Instance 1",
+        "type": "list",
+        "default": "---",
+        "description": "Data instance for calibration",
+        "list": [
+            "---",
+            "AWA",
+            "AWS",
+            "DBT",
+            "HDM",
+            "PRPOS",
+            "RPOS",
+            "STW",
+            "TWA",
+            "TWS",
+            "TWD",
+            "WTemp"
+        ],
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calOffset1",
+        "label": "Data Instance 1 Calibration Offset",
+        "type": "number",
+        "default": "0.00",
+        "description": "Offset for data instance 1",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSlope1",
+        "label": "Data Instance 1 Calibration Slope",
+        "type": "number",
+        "default": "1.00",
+        "description": "Slope for data instance 1",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSmooth1",
+        "label": "Data Instance 1 Smoothing",
+        "type": "number",
+        "default": "0",
+        "check": "checkMinMax",
+        "min": 0,
+        "max": 10,
+        "description": "Smoothing factor for data instance 1",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calInstance2",
+        "label": "Calibration Data Instance 2",
+        "type": "list",
+        "default": "---",
+        "description": "Data instance for calibration",
+        "list": [
+            "---",
+            "AWA",
+            "AWS",
+            "DBT",
+            "HDM",
+            "PRPOS",
+            "RPOS",
+            "STW",
+            "TWA",
+            "TWS",
+            "TWD",
+            "WTemp"
+        ],
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calOffset2",
+        "label": "Data Instance 2 Calibration Offset",
+        "type": "number",
+        "default": "0.00",
+        "description": "Offset for data instance 2",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSlope2",
+        "label": "Data Instance 2 Calibration Slope",
+        "type": "number",
+        "default": "1.00",
+        "description": "Slope for data instance 2",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSmooth2",
+        "label": "Data Instance 2 Smoothing",
+        "type": "number",
+        "default": "0",
+        "check": "checkMinMax",
+        "min": 0,
+        "max": 10,
+        "description": "Smoothing factor for data instance 2",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calInstance3",
+        "label": "Calibration Data Instance 3",
+        "type": "list",
+        "default": "---",
+        "description": "Data instance for calibration",
+        "list": [
+            "---",
+            "AWA",
+            "AWS",
+            "DBT",
+            "HDM",
+            "PRPOS",
+            "RPOS",
+            "STW",
+            "TWA",
+            "TWS",
+            "TWD",
+            "WTemp"
+        ],
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calOffset3",
+        "label": "Data Instance 3 Calibration Offset",
+        "type": "number",
+        "default": "0.00",
+        "description": "Offset for data instance 3",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSlope3",
+        "label": "Data Instance 3 Calibration Slope",
+        "type": "number",
+        "default": "1.00",
+        "description": "Slope for data instance 3",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
+    {
+        "name": "calSmooth3",
+        "label": "Data Instance 3 Smoothing",
+        "type": "number",
+        "default": "0",
+        "check": "checkMinMax",
+        "min": 0,
+        "max": 10,
+        "description": "Smoothing factor for data instance 3",
+        "category": "OBP40 Calibrations",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
     {
         "name": "display",
         "label": "Display Mode",
@@ -1015,6 +1198,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -1073,6 +1257,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page1type": "Fluid"
+            },
             {
                 "page1type": "FourValues"
             },
@@ -1085,6 +1272,9 @@
             {
                 "page1type": "RollPitch"
             },
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "ThreeValues"
             },
@@ -1093,9 +1283,6 @@
             },
             {
                 "page1type": "WindRoseFlex"
-            },
-            {
-                "page1type": "Fluid"
             }
         ]
     },
@@ -1119,6 +1306,9 @@
             {
                 "page1type": "RollPitch"
             },
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "ThreeValues"
             },
@@ -1147,6 +1337,9 @@
             {
                 "page1type": "FourValues2"
             },
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "ThreeValues"
             },
@@ -1172,6 +1365,9 @@
             {
                 "page1type": "FourValues2"
             },
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "WindRoseFlex"
             }
@@ -1188,6 +1384,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "WindRoseFlex"
             }
@@ -1204,6 +1403,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page1type": "SixValues"
+            },
             {
                 "page1type": "WindRoseFlex"
             }
@@ -1275,6 +1477,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -1330,6 +1533,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page2type": "Fluid"
+            },
             {
                 "page2type": "FourValues"
             },
@@ -1342,6 +1548,9 @@
             {
                 "page2type": "RollPitch"
             },
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "ThreeValues"
             },
@@ -1350,11 +1559,7 @@
             },
             {
                 "page2type": "WindRoseFlex"
-            },
-            {
-                "page2type": "Fluid"
             }
-
         ]
     },
     {
@@ -1377,6 +1582,9 @@
             {
                 "page2type": "RollPitch"
             },
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "ThreeValues"
             },
@@ -1405,6 +1613,9 @@
             {
                 "page2type": "FourValues2"
             },
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "ThreeValues"
             },
@@ -1430,6 +1641,9 @@
             {
                 "page2type": "FourValues2"
             },
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "WindRoseFlex"
             }
@@ -1446,6 +1660,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "WindRoseFlex"
             }
@@ -1462,6 +1679,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page2type": "SixValues"
+            },
             {
                 "page2type": "WindRoseFlex"
             }
@@ -1533,6 +1753,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -1585,6 +1806,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page3type": "Fluid"
+            },
             {
                 "page3type": "FourValues"
             },
@@ -1597,6 +1821,9 @@
             {
                 "page3type": "RollPitch"
             },
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "ThreeValues"
             },
@@ -1605,9 +1832,6 @@
             },
             {
                 "page3type": "WindRoseFlex"
-            },
-            {
-                "page3type": "Fluid"
             }
         ]
     },
@@ -1631,6 +1855,9 @@
             {
                 "page3type": "RollPitch"
             },
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "ThreeValues"
             },
@@ -1659,6 +1886,9 @@
             {
                 "page3type": "FourValues2"
             },
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "ThreeValues"
             },
@@ -1684,6 +1914,9 @@
             {
                 "page3type": "FourValues2"
             },
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "WindRoseFlex"
             }
@@ -1700,6 +1933,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "WindRoseFlex"
             }
@@ -1716,6 +1952,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page3type": "SixValues"
+            },
             {
                 "page3type": "WindRoseFlex"
             }
@@ -1787,6 +2026,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -1836,6 +2076,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page4type": "Fluid"
+            },
             {
                 "page4type": "FourValues"
             },
@@ -1848,6 +2091,9 @@
             {
                 "page4type": "RollPitch"
             },
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "ThreeValues"
             },
@@ -1856,9 +2102,6 @@
             },
             {
                 "page4type": "WindRoseFlex"
-            },
-            {
-                "page4type": "Fluid"
             }
         ]
     },
@@ -1882,6 +2125,9 @@
             {
                 "page4type": "RollPitch"
             },
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "ThreeValues"
             },
@@ -1910,6 +2156,9 @@
             {
                 "page4type": "FourValues2"
             },
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "ThreeValues"
             },
@@ -1935,6 +2184,9 @@
             {
                 "page4type": "FourValues2"
             },
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "WindRoseFlex"
             }
@@ -1951,6 +2203,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "WindRoseFlex"
             }
@@ -1967,6 +2222,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page4type": "SixValues"
+            },
             {
                 "page4type": "WindRoseFlex"
             }
@@ -2038,6 +2296,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -2084,6 +2343,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page5type": "Fluid"
+            },
             {
                 "page5type": "FourValues"
             },
@@ -2096,6 +2358,9 @@
             {
                 "page5type": "RollPitch"
             },
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "ThreeValues"
             },
@@ -2104,9 +2369,6 @@
             },
             {
                 "page5type": "WindRoseFlex"
-            },
-            {
-                "page5type": "Fluid"
             }
         ]
     },
@@ -2130,6 +2392,9 @@
             {
                 "page5type": "RollPitch"
             },
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "ThreeValues"
             },
@@ -2158,6 +2423,9 @@
             {
                 "page5type": "FourValues2"
             },
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "ThreeValues"
             },
@@ -2183,6 +2451,9 @@
             {
                 "page5type": "FourValues2"
             },
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "WindRoseFlex"
             }
@@ -2199,6 +2470,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "WindRoseFlex"
             }
@@ -2215,6 +2489,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page5type": "SixValues"
+            },
             {
                 "page5type": "WindRoseFlex"
             }
@@ -2286,6 +2563,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -2329,6 +2607,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page6type": "Fluid"
+            },
             {
                 "page6type": "FourValues"
             },
@@ -2341,6 +2622,9 @@
             {
                 "page6type": "RollPitch"
             },
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "ThreeValues"
             },
@@ -2349,9 +2633,6 @@
             },
             {
                 "page6type": "WindRoseFlex"
-            },
-            {
-                "page6type": "Fluid"
             }
         ]
     },
@@ -2375,6 +2656,9 @@
             {
                 "page6type": "RollPitch"
             },
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "ThreeValues"
             },
@@ -2403,6 +2687,9 @@
             {
                 "page6type": "FourValues2"
             },
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "ThreeValues"
             },
@@ -2428,6 +2715,9 @@
             {
                 "page6type": "FourValues2"
             },
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "WindRoseFlex"
             }
@@ -2444,6 +2734,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "WindRoseFlex"
             }
@@ -2460,6 +2753,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page6type": "SixValues"
+            },
             {
                 "page6type": "WindRoseFlex"
             }
@@ -2531,6 +2827,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -2571,6 +2868,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page7type": "Fluid"
+            },
             {
                 "page7type": "FourValues"
             },
@@ -2583,6 +2883,9 @@
             {
                 "page7type": "RollPitch"
             },
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "ThreeValues"
             },
@@ -2591,9 +2894,6 @@
             },
             {
                 "page7type": "WindRoseFlex"
-            },
-            {
-                "page7type": "Fluid"
             }
         ]
     },
@@ -2617,6 +2917,9 @@
             {
                 "page7type": "RollPitch"
             },
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "ThreeValues"
             },
@@ -2645,6 +2948,9 @@
             {
                 "page7type": "FourValues2"
             },
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "ThreeValues"
             },
@@ -2670,6 +2976,9 @@
             {
                 "page7type": "FourValues2"
             },
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "WindRoseFlex"
             }
@@ -2686,6 +2995,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "WindRoseFlex"
             }
@@ -2702,6 +3014,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page7type": "SixValues"
+            },
             {
                 "page7type": "WindRoseFlex"
             }
@@ -2773,6 +3088,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -2810,6 +3126,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page8type": "Fluid"
+            },
             {
                 "page8type": "FourValues"
             },
@@ -2822,6 +3141,9 @@
             {
                 "page8type": "RollPitch"
             },
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "ThreeValues"
             },
@@ -2830,9 +3152,6 @@
             },
             {
                 "page8type": "WindRoseFlex"
-            },
-            {
-                "page8type": "Fluid"
             }
         ]
     },
@@ -2856,6 +3175,9 @@
             {
                 "page8type": "RollPitch"
             },
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "ThreeValues"
             },
@@ -2884,6 +3206,9 @@
             {
                 "page8type": "FourValues2"
             },
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "ThreeValues"
             },
@@ -2909,6 +3234,9 @@
             {
                 "page8type": "FourValues2"
             },
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "WindRoseFlex"
             }
@@ -2925,6 +3253,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "WindRoseFlex"
             }
@@ -2941,6 +3272,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page8type": "SixValues"
+            },
             {
                 "page8type": "WindRoseFlex"
             }
@@ -3012,6 +3346,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -3046,6 +3381,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page9type": "Fluid"
+            },
             {
                 "page9type": "FourValues"
             },
@@ -3058,6 +3396,9 @@
             {
                 "page9type": "RollPitch"
             },
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "ThreeValues"
             },
@@ -3066,9 +3407,6 @@
             },
             {
                 "page9type": "WindRoseFlex"
-            },
-            {
-                "page9type": "Fluid"
             }
         ]
     },
@@ -3092,6 +3430,9 @@
             {
                 "page9type": "RollPitch"
             },
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "ThreeValues"
             },
@@ -3120,6 +3461,9 @@
             {
                 "page9type": "FourValues2"
             },
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "ThreeValues"
             },
@@ -3145,6 +3489,9 @@
             {
                 "page9type": "FourValues2"
             },
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "WindRoseFlex"
             }
@@ -3161,6 +3508,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "WindRoseFlex"
             }
@@ -3177,6 +3527,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page9type": "SixValues"
+            },
             {
                 "page9type": "WindRoseFlex"
             }
@@ -3248,6 +3601,7 @@
             "OneValue",
             "RollPitch",
             "RudderPosition",
+            "SixValues",
             "Solar",
             "ThreeValues",
             "TwoValues",
@@ -3279,6 +3633,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page10type": "Fluid"
+            },
             {
                 "page10type": "FourValues"
             },
@@ -3291,6 +3648,9 @@
             {
                 "page10type": "RollPitch"
             },
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "ThreeValues"
             },
@@ -3299,9 +3659,6 @@
             },
             {
                 "page10type": "WindRoseFlex"
-            },
-            {
-                "page10type": "Fluid"
             }
         ]
     },
@@ -3325,6 +3682,9 @@
             {
                 "page10type": "RollPitch"
             },
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "ThreeValues"
             },
@@ -3353,6 +3713,9 @@
             {
                 "page10type": "FourValues2"
             },
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "ThreeValues"
             },
@@ -3378,6 +3741,9 @@
             {
                 "page10type": "FourValues2"
             },
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "WindRoseFlex"
             }
@@ -3394,6 +3760,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "WindRoseFlex"
             }
@@ -3410,6 +3779,9 @@
             "obp40": "true"
         },
         "condition": [
+            {
+                "page10type": "SixValues"
+            },
             {
                 "page10type": "WindRoseFlex"
             }