lubtable is read successfully.

78 files changed, 944 insertions, 277 deletions

diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp
index 36a5b0c2b..576487ea2 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp
@@ -1,12 +1,4 @@
 
-/*
-
-ConvertColorToLinearInk called from GetRecommendedProcessParameters
-ConvertVolumeToRGBDisplay called from ProcessGradientStops
-integrate UseLubricant Boolean from roy everywhere
-
-*/
-
 
 #include "ColorConverter.h"
 #include "ColorConvert.h"
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.cpp
index 7a10f44f9..aedf7857a 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.cpp
@@ -25,8 +25,8 @@
 using namespace std;
 
 ForwardModel::ForwardModel() :
-	 m_nChannels(0), m_nPCSChannels(0), m_whiteptLab(NULL), m_prec(0),
-	m_nEntries(0), m_CoeffList(NULL), m_expList(NULL),  m_Vandermonde(NULL)
+	m_nChannels(0), m_nPCSChannels(0), m_whiteptLab(NULL), m_prec(0),
+	m_nEntries(0), m_CoeffList(NULL), m_expList(NULL), m_Vandermonde(NULL)
 {
 
 }
@@ -35,7 +35,7 @@ ForwardModel::~ForwardModel()
 {
 	if (m_CoeffList != NULL)
 	{
-		for (int i=0; i< m_nPCSChannels; ++i)
+		for (int i = 0; i < m_nPCSChannels; ++i)
 			delete[] m_CoeffList[i];
 		delete[] m_CoeffList;
 		m_CoeffList = NULL;
@@ -190,19 +190,19 @@ void ForwardModel::CalcFM(double *InInk, double *OutLab)
 {
 	int i, k;
 	//Calculate Vandermonde Vector [1 x number of entries]
-	for ( i = 0; i < m_nEntries; ++i)
+	for (i = 0; i < m_nEntries; ++i)
 	{
 		m_Vandermonde[i] = 1.0;
-		for ( k = 0; k < m_nChannels; ++k)
-			m_Vandermonde[i] *= std::pow( InInk[k], m_expList[i][k]);
+		for (k = 0; k < m_nChannels; ++k)
+			m_Vandermonde[i] *= std::pow(InInk[k], m_expList[i][k]);
 	}
 
 	//calculate Lab    Vandermodex Coeefficients + FreeTerm
 	for (i = 0; i < m_nPCSChannels; ++i)
-	{ 
+	{
 		OutLab[i] = m_whiteptLab[i];
 		for (k = 0; k < m_nEntries; ++k)
-			OutLab[i] += m_Vandermonde[k] * m_CoeffList[k][i] ;
+			OutLab[i] += m_Vandermonde[k] * m_CoeffList[k][i];
 	}
 }
 
@@ -210,7 +210,7 @@ void ForwardModel::SetFreeTerm(C_RGB_XYZ_Lab whiteptLab)
 {
 	if (m_whiteptLab == NULL)
 		m_whiteptLab = new double[m_nPCSChannels];
-	
+
 	m_whiteptLab[0] = whiteptLab.Get_x();
 	m_whiteptLab[1] = whiteptLab.Get_y();
 	m_whiteptLab[2] = whiteptLab.Get_z();
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.h
index a6b5f10ef..7ab7ef841 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ForwardModel.h
@@ -24,7 +24,7 @@ private:
 	void Set_nChannels(int nChannels) { m_nChannels = nChannels; };
 	void Set_nPCSChannels(int nPCSChannels) { m_nPCSChannels = nPCSChannels; };
 	void Set_nEntries(int nEntries) { m_nEntries = nEntries; };
-	
+
 	double **m_CoeffList;
 	double **m_expList;
 	double *m_Vandermonde;
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.cpp
index 4c43597ac..1524c3cb6 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.cpp
@@ -292,10 +292,19 @@ void LubTable::read_vertices(unsigned char* data, long datasize)
 		return;
 	}
 
-	if (vertices_lub == NULL)
+	if (vertices_lub == nullptr)
+	{
 		vertices_lub = new double[nVertices_lub][4][3];
-	if (vertices_unlub == NULL)
+		if (vertices_lub == nullptr)
+			throw std::exception("Could not allocate memory");
+	}
+
+	if (vertices_unlub == nullptr)
+	{
 		vertices_unlub = new double[nVertices_unlub][4][3];
+		if (vertices_unlub == nullptr)
+			throw std::exception("Could not allocate memory");
+	}
 
 	// the vertices are ordered as vert_i = (Lab,Lab,Lab,Lab)^T
 	uint16_t tmp[3];
@@ -384,15 +393,19 @@ void LubTable::read_points(unsigned char* data, long datasize)
 
 	// reading the points
 	int remsize = datasize - bytesread;
-	int Bsize = (int)(nPoints) * 3;
+	int Bsize = (int)(nPoints) * 6;
 	if (remsize != Bsize * (int)TablePrecision)
 	{
 		throw std::exception("GEO size missmatch");
 		return;
 	}
 
-	if (points == NULL)
+	if (points == nullptr)
+	{
 		points = new double[nPoints][6];
+		if (points == nullptr)
+			throw std::exception("Could not allocate memory");
+	}
 
 	// the vertices are ordered as pt_i = (Lab_lub,Lab_unlub)^T
 	uint16_t tmp[3];
@@ -495,6 +508,13 @@ void LubTable::read_text_description_type(int offset, int data_size, std::string
 	//return;
 }
 
+LubTable::LubTable()
+{
+	points = nullptr;
+	vertices_lub = nullptr;
+	vertices_unlub = nullptr;
+}
+
 LubTable::~LubTable()
 {
 	delete[] vertices_lub;
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.h
index adf468041..19598c8d8 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/LubTable.h
@@ -28,7 +28,7 @@ enum class Direction {
 
 class LubTable {
 public:
-	LubTable() = default;
+	LubTable();
 	~LubTable();
 	void init_lub_tables(bool has_LubData, uint8_t *data);  // make private under constructor?
 
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
 {
   {
     "ThreadL",
@@ -246,6 +246,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    17,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConversionInput, has_uselubricanttransform),
+    offsetof(ConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -263,12 +275,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   12,   /* field[12] = UseLightInks */
+  16,   /* field[16] = UseLubricantTransform */
   13,   /* field[13] = VMax */
 };
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  16,
+  17,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,12 @@ struct  _ConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.c
index 3b4f011b3..84ac3f36d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   gradient_conversion_input__free_unpacked
   assert(message->base.descriptor == &gradient_conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor gradient_conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor gradient_conversion_input__field_descripto
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(GradientConversionInput, has_uselubricanttransform),
+    offsetof(GradientConversionInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned gradient_conversion_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange gradient_conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor gradient_conversion_input__descriptor =
   "GradientConversionInput",
   "",
   sizeof(GradientConversionInput),
-  10,
+  11,
   gradient_conversion_input__field_descriptors,
   gradient_conversion_input__field_indices_by_name,
   1,  gradient_conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.h
index fa9007907..88e8aa02b 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/GradientConversionInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _GradientConversionInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define GRADIENT_CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&gradient_conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* GradientConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 115985567..876fbb7a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void   out_of_gamut_input__free_unpacked
   assert(message->base.descriptor == &out_of_gamut_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
 {
   {
     "ThreadL",
@@ -162,6 +162,18 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[9] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    10,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(OutOfGamutInput, has_uselubricanttransform),
+    offsetof(OutOfGamutInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -173,11 +185,12 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  9,   /* field[9] = UseLubricantTransform */
 };
 static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
 {
@@ -187,7 +200,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
   "OutOfGamutInput",
   "",
   sizeof(OutOfGamutInput),
-  9,
+  10,
   out_of_gamut_input__field_descriptors,
   out_of_gamut_input__field_indices_by_name,
   1,  out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 4255f3b82..41d5749be 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -46,10 +46,12 @@ struct  _OutOfGamutInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define OUT_OF_GAMUT_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index 1d4e52e7f..39c139cda 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLubricantTransform",
+    11,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselubricanttransform),
+    offsetof(RecommendedProcessTableInput, uselubricanttransform),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -186,11 +198,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
   7,   /* field[7] = UseLightInks */
+  10,   /* field[10] = UseLubricantTransform */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  10,
+  11,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 393b50ddc..e75ddd39e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -49,10 +49,12 @@ struct  _RecommendedProcessTableInput
   ProtobufCBinaryData gbddata;
   protobuf_c_boolean has_lubdata;
   ProtobufCBinaryData lubdata;
+  protobuf_c_boolean has_uselubricanttransform;
+  protobuf_c_boolean uselubricanttransform;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.cpp
index cc53b0473..087bac57e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.cpp
@@ -410,6 +410,21 @@ const C_RGB_XYZ_Lab  &ColorConvert::GetReferenceWhite(void) const
 	 return(DataRGB);
  }
 
+VectorXd ColorConvert::LabtoRGB(VectorXd & LabVal)
+ {
+	 C_RGB_XYZ_Lab DataXYZ;
+	 C_RGB_XYZ_Lab DataLab;
+	 DataLab.Set(LabVal);
+	 DataXYZ = LabToXYZ(DataLab);
+	 C_RGB_XYZ_Lab DataRGB;
+	 DataRGB = XYZtoRGB(DataXYZ);
+	 VectorXd VecRGB(3);
+	 VecRGB(0) = DataRGB.Get_x();
+	 VecRGB(1) = DataRGB.Get_y();
+	 VecRGB(2) = DataRGB.Get_z();
+	 return(VecRGB);
+ }
+
  C_RGB_XYZ_Lab ColorConvert::LabtoRGBNoClip(C_RGB_XYZ_Lab& LabVal)
  {
 	 C_RGB_XYZ_Lab DataXYZ;
@@ -469,19 +484,23 @@ const C_RGB_XYZ_Lab  &ColorConvert::GetReferenceWhite(void) const
 	 LabOut[0] = LabOut1.Get_x();
 	 LabOut[1] = LabOut1.Get_y();
 	 LabOut[2] = LabOut1.Get_z();
-	// SetReferenceWhite(SourceWhite);
-/*	 C_RGB_XYZ_Lab LabOut2;
-	 LabOut2 = XYZToLab(XYZ);
-	 double *LabD = new double[3];
-	 double x = 100 - Lab.Get_x();
-	 double f = 100.0 / (100.0 + pow(x, 3) / 100.0);
-	 LabD[0] = f*LabOut1.Get_x() + (1-f) *LabOut2.Get_x();
-	 LabD[1] = f*LabOut1.Get_y() + (1 - f) *LabOut2.Get_y();
-	 LabD[2] = f*LabOut1.Get_z() + (1 - f) *LabOut2.Get_z();
-	 return(LabD); */
  }
 
-
+ void ColorConvert::ChangeWP(VectorXd LabIn, VectorXd LabOut, C_RGB_XYZ_Lab SourceWhite, C_RGB_XYZ_Lab DestWhite)
+ {
+	 SetReferenceWhite(SourceWhite);
+	 C_RGB_XYZ_Lab Lab;
+	 Lab.Set(LabIn(0), LabIn(1), LabIn(2));
+	 C_RGB_XYZ_Lab XYZ = LabToXYZ(Lab);
+	 SetReferenceWhite(DestWhite);
+	 C_RGB_XYZ_Lab LabOut1;
+	 LabOut1 = XYZToLab(XYZ);
+	 // LabOut1.Clamp(LowLab, HighLab);
+	 // double *LabD = new double[3];
+	 LabOut(0) = LabOut1.Get_x();
+	 LabOut(1) = LabOut1.Get_y();
+	 LabOut(2) = LabOut1.Get_z();
+ }
  void ColorConvert::ChangeWP(C_RGB_XYZ_Lab XYZIn, C_RGB_XYZ_Lab &LabOut, C_RGB_XYZ_Lab SourceWhite, C_RGB_XYZ_Lab DestWhite)
  {
 	 SetReferenceWhite(SourceWhite);
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.h
index 55e1ebc41..0fba95be1 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorConvert.h
@@ -81,7 +81,9 @@ class ColorConvert
 		void LabtoRGB(double*InLab, double* OutRGB );
 		void ChangeWP(double *LabIn, double *LabOut, C_RGB_XYZ_Lab SourceWhite, C_RGB_XYZ_Lab DestWhite);
 		void ChangeWP(C_RGB_XYZ_Lab LabIn, C_RGB_XYZ_Lab &LabOut, C_RGB_XYZ_Lab SourceWhite, C_RGB_XYZ_Lab DestWhite);
+		void ChangeWP(VectorXd LabIn, VectorXd LabOut, C_RGB_XYZ_Lab SourceWhite, C_RGB_XYZ_Lab DestWhite);
 		C_RGB_XYZ_Lab LabtoRGB(C_RGB_XYZ_Lab& LabVal);
+		VectorXd LabtoRGB(VectorXd & LabVal);
 		void RGBtoLab(double *InRGB, double *OutLab);
 		C_RGB_XYZ_Lab RGBtoLab(C_RGB_XYZ_Lab& RGB);
 	//	void RGBtoLab(std::vector<double>&InRGB, double *OutLab);
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.cpp
index 9e59abf4d..ded4200aa 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.cpp
@@ -35,9 +35,9 @@ using namespace std;
 
 
 	ColorTransf::ColorTransf() :
-		m_MSBShift(0), m_DataBuffer(NULL), m_SeparationsIn(0),
+		m_MSBShift(0),  m_SeparationsIn(0),
 		m_SeparationsOut(0), m_nGridPoints(0), m_GamutLimitsNlperCM(NULL),
-		m_NGamutRegions(0), m_ByteBuffer(NULL), m_InputCurves(NULL), m_OutputCurves(NULL),
+		m_NGamutRegions(0), m_InputCurves(NULL), m_OutputCurves(NULL),
 		 m_num_input_table_entries(0), m_num_output_table_entries(0)
 	{
 	
@@ -45,21 +45,11 @@ using namespace std;
 
 	ColorTransf::~ColorTransf()
 	{
-		if (m_DataBuffer != NULL)
-		{
-			delete[] m_DataBuffer;
-			m_DataBuffer = NULL;
-		}
 		if (m_GamutLimitsNlperCM != NULL)
 		{
 			delete[] m_GamutLimitsNlperCM;
 			m_GamutLimitsNlperCM = NULL;
 		}
-		if (m_ByteBuffer != NULL)
-		{
-			delete[] m_ByteBuffer;
-			m_ByteBuffer = NULL;
-		}
 		if (m_InputCurves != NULL)
 		{
 			delete[] m_InputCurves;
@@ -203,8 +193,8 @@ using namespace std;
 		if (TablePrecision == 1)
 		{		
 //			int lsizeH2 = (lSize - bytesread + 1) / 2;
-			if(m_ByteBuffer == NULL)
-				m_ByteBuffer = new unsigned char[clut_size];
+			unsigned char *ByteBuffer = new unsigned char[clut_size];
+	
 			int lSizeperSep = clut_size / m_SeparationsOut;
 			int indR = 0;
 			for (int i = 0; i < lSizeperSep; ++i)
@@ -212,32 +202,30 @@ using namespace std;
 				for (int j = 0; j < m_SeparationsOut; ++j)
 				{
 					//m_ByteBuffer[indR] = Conv.ByteToShort(buffer, bytesread);
-					m_ByteBuffer[indR] = buffer[bytesread];
+					ByteBuffer[indR] = buffer[bytesread];
 					bytesread += 1;
 					indR++;
 				}
 			}
-			m_InterpColor.InitData(m_ByteBuffer, m_SeparationsIn, m_SeparationsOut, m_nGridPoints, m_MSBShift);
+			m_InterpColor.InitData(ByteBuffer, m_SeparationsIn, m_SeparationsOut, m_nGridPoints, m_MSBShift);
 		}
 		else
 		{
 //			int lsizeH4 = (lSize - bytesread + 1) / 2;
-			if(m_DataBuffer == NULL)
-				m_DataBuffer = new unsigned short[clut_size];
-			//m_DataBuffer = DBG_NEW unsigned short[lsizeH4];
+			unsigned short *DataBuffer = new unsigned short[clut_size];
 			int lSizeperSep = clut_size / m_SeparationsOut;
 			int indR = 0;
 			for (int i = 0; i < lSizeperSep; ++i)
 			{
 				for (int j = 0; j < m_SeparationsOut; ++j)
 				{
-					m_DataBuffer[indR] = Conv.ByteToShort(buffer, bytesread);
+					DataBuffer[indR] = Conv.ByteToShort(buffer, bytesread);
 					bytesread += 2;
 					indR++;
 				}
 			}
 			// terminate reading data file
-			m_InterpColor.InitData(m_DataBuffer, m_SeparationsIn, m_SeparationsOut, m_nGridPoints, m_MSBShift);
+			m_InterpColor.InitData(DataBuffer, m_SeparationsIn, m_SeparationsOut, m_nGridPoints, m_MSBShift);
 		}
 
 		//Read Output Curves
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.h
index e61135dae..ea0b3d033 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ColorTransf.h
@@ -35,9 +35,6 @@ private:
 	Interp *m_OutputCurves;
 	void free_char_array(char* charname);
 
-	unsigned short *m_DataBuffer;
-	unsigned char *m_ByteBuffer;
-
 	void SetNGridpoints(int nGridPoints) { m_nGridPoints = nGridPoints; };
 	void SetSeparationsIn(int SeparationsIn) { m_SeparationsIn = SeparationsIn; };
 	void SetSeparationsOut(int SeparationsOut) { m_SeparationsOut = SeparationsOut; };
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.cpp
index 3e4f49878..9294168fe 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.cpp
@@ -40,7 +40,7 @@ typedef enum {
 
 GBD::GBD() :
 	m_prec(0), m_nPCSChan(0),
-	m_nDevChan(0), m_CenterLab(0), m_nVertices(0), m_Vertices(NULL),
+	m_nDevChan(0), m_CenterLab(0), m_nVertices(0), 
 	m_nTriangles(0), m_vert0(NULL), m_vert1(NULL), m_vert2(NULL)
 {
 	
@@ -69,12 +69,6 @@ GBD::~GBD()
 		delete[] m_vert2;
 		m_vert2 = NULL;
 	}
-	if (m_Vertices != NULL)
-	{
-		delete[] m_Vertices;
-		m_Vertices = NULL;
-	}
-
 }
 
 void GBD::TriangleRayIntersection(double *origin, double *direction, bool &intersect, double *xCoor)
@@ -174,6 +168,96 @@ void GBD::TriangleRayIntersection(double *origin, double *direction, bool &inter
 	return;
 }
 
+double **GBD::GetVertices(int iVert)
+{
+	switch (iVert)
+	{
+	case 0:
+	{
+		return(m_vert0);
+		break;
+	}
+	case 1:
+	{
+		return(m_vert1);
+		break;
+	}
+	case 2:
+	{
+		return(m_vert2);
+		break;
+	}
+	default:
+	{
+		throw std::exception("Unsupported vertex number");
+		return(0);
+	}
+	}
+}
+
+
+void GBD::SetVertices(double **vert, int iVert, int oldn, int newn)
+{
+	switch (iVert)
+	{
+	case 0:
+	{
+		if (m_vert0 != NULL)
+		{
+			for (int i = 0; i < oldn; ++i)
+				delete[] m_vert0[i];
+			delete[] m_vert0;
+		}
+		m_vert0 = new double*[newn];
+		for (int i = 0; i < newn; ++i)
+		{
+			m_vert0[i] = new double[m_nPCSChan];
+			for (int j = 0; j < m_nPCSChan; ++j)
+				m_vert0[i][j] = vert[i][j];
+		}
+		break;
+	}
+	case 1:
+	{
+		if (m_vert1 != NULL)
+		{
+			for (int i = 0; i < oldn; ++i)
+				delete[] m_vert1[i];
+			delete[] m_vert1;
+		}
+		m_vert1 = new double*[newn];
+		for (int i = 0; i < newn; ++i)
+		{
+			m_vert1[i] = new double[m_nPCSChan];
+			for (int j = 0; j < m_nPCSChan; ++j)
+				m_vert1[i][j] = vert[i][j];
+		}
+		break;
+	}
+	case 2:
+	{
+		if (m_vert2 != NULL)
+		{
+			for (int i = 0; i < oldn; ++i)
+				delete[] m_vert2[i];
+			delete[] m_vert2;
+		}
+		m_vert2 = new double*[newn];
+		for (int i = 0; i < newn; ++i)
+		{
+			m_vert2[i] = new double[m_nPCSChan];
+			for (int j = 0; j < m_nPCSChan; ++j)
+				m_vert2[i][j] = vert[i][j];
+		}
+		break;
+	}
+	default:
+	{
+		throw std::exception("Unsupported vertex number");
+		return;
+	}
+	}
+}
 void GBD::InitData(unsigned char* colorTransformBuffer, long colorTransformFileSize)
 {
 	// 0-3   prec
@@ -338,3 +422,4 @@ void GBD::crossProduct(VectorXd vect_A, VectorXd vect_B, VectorXd &cross_P)
 	return;
 }
 
+
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.h
index 61aadf37a..75c528d1c 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/GBD.h
@@ -13,8 +13,15 @@ public:
 	int GetDev_Channels() { return(m_nDevChan); };
 	int GetNTriangles() { return(m_nTriangles); };
 	C_RGB_XYZ_Lab getCenter(){ return(m_CenterLab);};
+	double **GetVertices(int i);
+	void SetVertices(double **Vert, int i, int oldn, int newn);
 	void InitData(unsigned char* colorTransformBuffer, long colorTransformFileSize);
 	void TriangleRayIntersection(double *origin, double *direction, bool &intersect, double *xCoor);
+	void SetNVertices(int nVertices) { m_nVertices = nVertices; };
+	void SetNPCS_Channels(int nPCSChan) { m_nPCSChan = nPCSChan; };
+	void SetNDev_Channels(int nDevChan) { m_nDevChan = nDevChan; };
+	void SetNTriangles(int nTriangles) { m_nTriangles = nTriangles; };
+	void SetCenter(C_RGB_XYZ_Lab center) {m_CenterLab = center;};
 private:
 	int m_prec;
 	int m_nDevChan;
@@ -22,14 +29,10 @@ private:
 	int m_nVertices;
 	int m_nTriangles;
 	C_RGB_XYZ_Lab m_CenterLab;
-	C_RGB_XYZ_Lab *m_Vertices;
 	double **m_vert0;
 	double **m_vert1;
 	double **m_vert2;
-	void SetNVertices(int nVertices) { m_nVertices = nVertices; };
-	void SetNPCS_Channels(int nPCSChan) { m_nPCSChan = nPCSChan; };
-	void SetNDev_Channels(int nDevChan) { m_nDevChan = nDevChan; };
-	void SetNTriangles(int nTriangles) { m_nTriangles = nTriangles; };
+	
 	//void SetCenter( C_RGB_XYZ_Lab CenterLab);	
 	double dotProduct(VectorXd vect_A, VectorXd vect_B);
 	void crossProduct(VectorXd vect_A, VectorXd vect_B, VectorXd &cross_P);
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.cpp
index 865713737..ade641230 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.cpp
@@ -106,7 +106,7 @@ LevMar::~LevMar()
 	}
 	if (m_LULS != NULL)
 	{
-		delete[] m_LULS;
+		delete  m_LULS;
 		m_LULS = NULL;
 	}
 }
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.h
index fff02fe0a..289508345 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/LevMar.h
@@ -51,7 +51,6 @@ private:
 	C_RGB_XYZ_Lab m_WPLabRel; 
 	C_RGB_XYZ_Lab m_WPTarget;
 	VectorXd m_distWeights;
-	ColorTable m_ColorTable;
 	double *m_ValsIn;
 	double *m_Lab_Iter;
 	double *m_difLab;
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.cpp
index d5d39dbc3..492d9114a 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.cpp
@@ -24,7 +24,7 @@ extern "C"
 		NDInterpUtils::NDInterpUtils() :
 				m_MSBShift(Sh4MSB), m_DataBuffer(NULL), m_nSeparationsIn(nSeparationsIn), m_Point(NULL),
 				m_nSeparationsOut(nSeparationsOut), m_nGridPoints(0), m_SubCubeSize(0), m_LastCubeComp(0),
-			m_tmpResult(NULL)
+			m_tmpResult(NULL), m_ByteBuffer(NULL)
 		{
 		}
 
@@ -48,7 +48,7 @@ extern "C"
 		void NDInterpUtils::InitData(unsigned char *DataBuffer, int SeparationsIn, int SeparationsOut, int nGridPoints, int MSBShift)
 		{
 			SetMSBShift(MSBShift);
-			SetNDData((unsigned short *)DataBuffer);
+			SetNDData((unsigned char *)DataBuffer);
 			SetSeparationsIn(SeparationsIn);
 			SetSeparationsOut(SeparationsOut);
 			SetNGridpoints(nGridPoints);
@@ -68,10 +68,31 @@ extern "C"
 						delete m_Point;
 				if (m_tmpResult != NULL)
 						delete m_tmpResult;
-
+				if (m_DataBuffer != NULL)
+					delete m_DataBuffer;
+				if (m_ByteBuffer != NULL)
+					delete m_ByteBuffer;
 		}
 
+		void  NDInterpUtils::SetNDData(unsigned short *DataBuffer)
+		{
+			int nsize = sizeof(DataBuffer);
+			if (m_DataBuffer == NULL)
+				m_DataBuffer = new unsigned short[nsize];
+
+			for (int i = 0; i < nsize; ++i)
+				m_DataBuffer[i] = DataBuffer[i];
+		}
 
+		void  NDInterpUtils::SetNDData(unsigned char *DataBuffer)
+		{
+			int nsize = sizeof(DataBuffer);
+			if (m_ByteBuffer == NULL)
+				m_ByteBuffer = new unsigned char[nsize];
+			
+			for (int i = 0; i < nsize; ++i)
+				m_ByteBuffer[i] = DataBuffer[i];
+		}
 
 		void  NDInterpUtils::ColorMap4(const unsigned short * ValIn, double * ValOut)
 		{
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.h
index eb600e617..88c416453 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/NDInterpUtils.h
@@ -40,12 +40,13 @@ private:
 	int m_nSeparationsOut;
 	int m_nGridPoints;
 	unsigned short *m_DataBuffer;
+	unsigned char *m_ByteBuffer;
 	unsigned short *m_Point;
 	int *m_tmpResult;
 	void SetSubCubeSize();
 	void SetMSBShift(unsigned char ShMSB) { m_MSBShift = ShMSB; };
 	void SetLastCubeComp() { m_LastCubeComp = 0xFF - m_SubCubeSize / 2; };
-	void SetdataBuffer(unsigned short *DataBuffer) { m_DataBuffer = DataBuffer; };
+
 	void getMax4(int a, int b, int c, int d, int &max, int &pos);
 	void getOrdering4(int a, int b, int c, int d,
 		int &max, int &mid1, int &mid2, int &min, int &maxPos,
@@ -55,7 +56,8 @@ private:
 		int &max, int &mid1,  int &min, int &maxPos,
 		int &midPos1,  int &minPos);
 	void SetMSBShift(int MSBShift) { m_MSBShift = MSBShift; };
-	void SetNDData(unsigned short *DataBuffer) { m_DataBuffer = DataBuffer; };
+	void SetNDData(unsigned short *DataBuffer);
+	void SetNDData(unsigned char *DataBuffer);
 	void SetSeparationsIn(int SeparationsIn) { m_nSeparationsIn = SeparationsIn; };
 	void SetSeparationsOut(int SeparationsOut) { m_nSeparationsOut = SeparationsOut; };
 	void SetNGridpoints(int nGridPoints) { m_nGridPoints = nGridPoints; };
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.cpp
index 2e746f09b..181c60ccb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.cpp
@@ -6,6 +6,7 @@
 #include "ColorTable.h"
 #include "Dense"
 
+
 using Eigen::MatrixXd;
 using Eigen::VectorXd;
 using Eigen::VectorXi;
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.h
index 2e2da1f64..21427e516 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Utils/ObjectiveFunction.h
@@ -4,6 +4,7 @@
 
 #include "C_RGB_XYZ_Lab.h"
 #include "ColorTable.h"
+#include "ForwardModel.h"
 
 class ObjectiveFunction
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
index 0882d43e0..ca3c3e322 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -245,6 +245,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     input.ThreadB = RML.WhitePointB;
 
                     input.UseLightInks = RML.UseLightInks;
+                    input.UseLubricantTransform = RML.UseLubricantTransform;
                     input.VMax = RML.VMax;
 
                     //Validate calibration data
@@ -383,6 +384,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 input.ThreadB = RML.WhitePointB;
 
                 input.UseLightInks = RML.UseLightInks;
+                input.UseLubricantTransform = RML.UseLubricantTransform;
                 input.VMax = RML.VMax;
 
                 foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 7e3b4fa4a..08af47ef4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -267,6 +267,7 @@
 
                                                             <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Left" Margin="0 20 0 0">Enable Gradient Generation</CheckBox>
                                                             <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Light Inks</CheckBox>
+                                                            <CheckBox ToolTip="Use lubricant transformation when converting to liquid volumes" IsChecked="{Binding ActiveRML.UseLubricantTransform}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Lubricant Transform</CheckBox>
 
                                                             <DockPanel Margin="0 10 0 0">
                                                                 <TextBlock VerticalAlignment="Center" Text="V-Max:" ></TextBlock>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index be6c9486f..e3b9f676c 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -270,6 +270,14 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// use lubricant transform
+        /// </summary>
+        public Boolean UseLubricantTransform 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// head type
         /// </summary>
         public Int32 HeadType 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 5aac56248..17b29d691 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -71,6 +71,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> UseLightInksChanged;
 
+        public event EventHandler<Boolean> UseLubricantTransformChanged;
+
         public event EventHandler<Int32> HeadTypeChanged;
 
         public event EventHandler<Int32> QualificationLevelChanged;
@@ -973,6 +975,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Boolean _uselubricanttransform;
+
+        /// <summary>
+        /// Gets or sets the rmlbase use lubricant transform.
+        /// </summary>
+
+        [Column("USE_LUBRICANT_TRANSFORM")]
+
+        public  Boolean UseLubricantTransform
+        {
+            get 
+            {
+                return _uselubricanttransform; 
+            }
+
+            set 
+            {
+                if (_uselubricanttransform != value)
+                {
+                    _uselubricanttransform = value;
+
+                    OnUseLubricantTransformChanged(value);
+
+                }
+            }
+        }
+
         protected Int32 _headtype;
 
         /// <summary>
@@ -2262,6 +2291,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the UseLubricantTransform has changed.
+        /// </summary>
+        protected virtual void OnUseLubricantTransformChanged(Boolean uselubricanttransform)
+        {
+            UseLubricantTransformChanged?.Invoke(this, uselubricanttransform);
+            RaisePropertyChanged(nameof(UseLubricantTransform));
+        }
+
+        /// <summary>
         /// Called when the HeadType has changed.
         /// </summary>
         protected virtual void OnHeadTypeChanged(Int32 headtype)
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index cdb00a3ee..20e17bcc6 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -149,6 +149,8 @@ namespace Tango.ColorConversion
 
             conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && useLightInks && settings.UseLightInks;
 
+            conversionInput.UseLubricantTransform = rml.UseLubricantTransform;
+
             conversionInput.VMax = rml.VMax;
 
             conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data);
@@ -337,6 +339,8 @@ namespace Tango.ColorConversion
             input.ThreadA = rml.WhitePointA;
             input.ThreadB = rml.WhitePointB;
 
+            input.UseLubricantTransform = rml.UseLubricantTransform;
+
             input.InputCoordinates = new InputCoordinates();
 
             if (stop.BrushColorSpace == ColorSpaces.RGB)
@@ -553,6 +557,8 @@ namespace Tango.ColorConversion
 
             var settings = SettingsManager.Default.GetOrCreate<ColorConversionSettings>();
             input.UseLightInks = settings.UseLightInks && rml.UseLightInks && machine.LightInksInstalled && useLightInks;
+            input.UseLubricantTransform = rml.UseLubricantTransform;
+            
             //TODO: Do we need input.Vmax ?? (Mirta)
 
             foreach (var prTable in rml.GetActiveProcessGroup().ProcessParametersTables)
@@ -802,6 +808,8 @@ namespace Tango.ColorConversion
                 conversionInput.LubData = ByteString.CopyFrom(rml.Lub.Data);
             }
 
+            conversionInput.UseLubricantTransform = rml.UseLubricantTransform;
+
             conversionInput.ThreadL = rml.WhitePointL;
             conversionInput.ThreadA = rml.WhitePointA;
             conversionInput.ThreadB = rml.WhitePointB;
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 5488e8c54..b1f71c687 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -61,6 +61,7 @@ namespace Tango.DAL.Remote.DB
         public int COLOR_CONVERSION_VERSION { get; set; }
         public bool USE_COLOR_LIB_GRADIENTS { get; set; }
         public bool USE_LIGHT_INKS { get; set; }
+        public bool USE_LUBRICANT_TRANSFORM { get; set; }
         public int HEAD_TYPE { get; set; }
         public int QUALIFICATION_LEVEL { get; set; }
         public Nullable<System.DateTime> QUALIFICATION_DATE { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index d52f40cab..dc068684b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1309,6 +1309,7 @@
           <Property Name="COLOR_CONVERSION_VERSION" Type="int" Nullable="false" />
           <Property Name="USE_COLOR_LIB_GRADIENTS" Type="bit" Nullable="false" />
           <Property Name="USE_LIGHT_INKS" Type="bit" Nullable="false" />
+          <Property Name="USE_LUBRICANT_TRANSFORM" Type="bit" Nullable="false" />
           <Property Name="HEAD_TYPE" Type="int" Nullable="false" />
           <Property Name="QUALIFICATION_LEVEL" Type="int" Nullable="false" />
           <Property Name="QUALIFICATION_DATE" Type="datetime2" Precision="3" />
@@ -6823,6 +6824,7 @@
           <Property Name="COLOR_CONVERSION_VERSION" Type="Int32" Nullable="false" />
           <Property Name="USE_COLOR_LIB_GRADIENTS" Type="Boolean" Nullable="false" />
           <Property Name="USE_LIGHT_INKS" Type="Boolean" Nullable="false" />
+          <Property Name="USE_LUBRICANT_TRANSFORM" Type="Boolean" Nullable="false" />
           <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" />
           <Property Name="QUALIFICATION_LEVEL" Type="Int32" Nullable="false" />
           <Property Name="QUALIFICATION_DATE" Type="DateTime" Precision="3" />
@@ -10214,6 +10216,7 @@
                 <ScalarProperty Name="QUALIFICATION_DATE" ColumnName="QUALIFICATION_DATE" />
                 <ScalarProperty Name="QUALIFICATION_LEVEL" ColumnName="QUALIFICATION_LEVEL" />
                 <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" />
+                <ScalarProperty Name="USE_LUBRICANT_TRANSFORM" ColumnName="USE_LUBRICANT_TRANSFORM" />
                 <ScalarProperty Name="USE_LIGHT_INKS" ColumnName="USE_LIGHT_INKS" />
                 <ScalarProperty Name="USE_COLOR_LIB_GRADIENTS" ColumnName="USE_COLOR_LIB_GRADIENTS" />
                 <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index f48276400..5beb4e96f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,102 +5,102 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="68.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="86.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="89.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="9.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="13.5" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="15.75" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="78.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="64.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="105.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="104.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="57.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="29.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="62.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.5" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="31.25" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3.75" PointY="44.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="78.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="1.5" PointY="90" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3.75" PointY="89.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="76.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.375" />
         <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="41.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="79.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="92.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="83.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="89" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="97.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="85.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="89.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="109.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="97.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="101.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="93" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="92.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="109.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="97.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="32" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="16.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="52.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="35.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="7.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.5" PointY="85" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11.75" PointY="72.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="59" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="68.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="94" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="80" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="62" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="62.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.5" PointY="89" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10.75" PointY="77.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.5" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="8.75" PointY="72.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="86" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="70.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3.75" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="6" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="20.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="40.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="8.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="41.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3.75" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.25" />
         <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="19" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.875" />
         <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
         <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="17.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="15.25" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="28.375" />
         <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="25.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="42.625" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="33" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="6.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="49.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="21.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="22.75" PointY="6.25" />
         <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
         <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="16.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="30.625" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index 592297ca0..a1f1538d3 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIrMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
+            "Y2Vzc1JhbmdlLnByb3RvItIDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
             "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
             "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
             "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
@@ -34,11 +34,12 @@ namespace Tango.PMR.ColorLab {
             "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
             "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
             "EgwKBFZNYXgYDiABKAESDwoHR2JkRGF0YRgPIAEoDBIPCgdMdWJEYXRhGBAg",
-            "ASgMQh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "ASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9ybRgRIAEoCEIeChxjb20udHdp",
+            "bmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -85,6 +86,7 @@ namespace Tango.PMR.ColorLab {
       vMax_ = other.vMax_;
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -267,6 +269,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 17;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConversionInput);
@@ -296,6 +309,7 @@ namespace Tango.PMR.ColorLab {
       if (VMax != other.VMax) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -318,6 +332,7 @@ namespace Tango.PMR.ColorLab {
       if (VMax != 0D) hash ^= VMax.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -389,6 +404,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(130, 1);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(136, 1);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -440,6 +459,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 2 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 2 + 1;
+      }
       return size;
     }
 
@@ -497,6 +519,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -574,6 +599,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 136: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
index abb24ddb0..37e3642fa 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
@@ -24,19 +24,20 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "Ch1HcmFkaWVudENvbnZlcnNpb25JbnB1dC5wcm90bxISVGFuZ28uUE1SLkNv",
             "bG9yTGFiGhJQcm9jZXNzUmFuZ2UucHJvdG8aEUlucHV0TGlxdWlkLnByb3Rv",
-            "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byLAAgoXR3JhZGllbnRDb252ZXJz",
+            "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byLfAgoXR3JhZGllbnRDb252ZXJz",
             "aW9uSW5wdXQSDwoHVGhyZWFkTBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8K",
             "B1RocmVhZEIYAyABKAESEwoLRm9yd2FyZERhdGEYBCABKAwSFQoNU2VnbWVu",
             "dExlbmd0aBgFIAEoARI0CgVTdG9wcxgGIAMoCzIlLlRhbmdvLlBNUi5Db2xv",
             "ckxhYi5HcmFkaWVudElucHV0U3RvcBI1CgxJbnB1dExpcXVpZHMYByADKAsy",
             "Hy5UYW5nby5QTVIuQ29sb3JMYWIuSW5wdXRMaXF1aWQSNwoNUHJvY2Vzc1Jh",
             "bmdlcxgIIAMoCzIgLlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFuZ2US",
-            "DwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4KHGNvbS50d2lu",
-            "ZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "DwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMEh0KFVVzZUx1YnJp",
+            "Y2FudFRyYW5zZm9ybRgLIAEoCEIeChxjb20udHdpbmUudGFuZ28ucG1yLmNv",
+            "bG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -77,6 +78,7 @@ namespace Tango.PMR.ColorLab {
       processRanges_ = other.processRanges_.Clone();
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -191,6 +193,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 11;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as GradientConversionInput);
@@ -214,6 +227,7 @@ namespace Tango.PMR.ColorLab {
       if(!processRanges_.Equals(other.processRanges_)) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -230,6 +244,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= processRanges_.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -271,6 +286,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(82);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(88);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -300,6 +319,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -332,6 +354,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +407,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 88: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
index e56cf37fe..ebde255c5 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
@@ -24,18 +24,19 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVPdXRPZkdhbXV0SW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIqgCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
+            "Y2Vzc1JhbmdlLnByb3RvIscCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
             "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
             "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
             "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
             "b3JMYWIuSW5wdXRDb29yZGluYXRlcxITCgtGb3J3YXJkRGF0YRgGIAEoDBI3",
             "Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlBy",
-            "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAxC",
-            "HgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAwS",
+            "HQoVVXNlTHVicmljYW50VHJhbnNmb3JtGAogASgIQh4KHGNvbS50d2luZS50",
+            "YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -75,6 +76,7 @@ namespace Tango.PMR.ColorLab {
       processRanges_ = other.processRanges_.Clone();
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -180,6 +182,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 10;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as OutOfGamutInput);
@@ -202,6 +215,7 @@ namespace Tango.PMR.ColorLab {
       if(!processRanges_.Equals(other.processRanges_)) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -217,6 +231,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= processRanges_.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -260,6 +275,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(74);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(80);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -290,6 +309,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -326,6 +348,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -375,6 +400,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 80: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
index 8384769a6..4e5a52d8d 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
@@ -24,19 +24,20 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "CiJSZWNvbW1lbmRlZFByb2Nlc3NUYWJsZUlucHV0LnByb3RvEhJUYW5nby5Q",
             "TVIuQ29sb3JMYWIaElByb2Nlc3NSYW5nZS5wcm90bxoRSW5wdXRMaXF1aWQu",
-            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIsQCChxSZWNvbW1lbmRl",
+            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIuMCChxSZWNvbW1lbmRl",
             "ZFByb2Nlc3NUYWJsZUlucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFk",
             "QRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEhMKC0ZvcndhcmREYXRhGAQgASgM",
             "EjQKBVN0b3BzGAUgAygLMiUuVGFuZ28uUE1SLkNvbG9yTGFiLkdyYWRpZW50",
             "SW5wdXRTdG9wEjUKDElucHV0TGlxdWlkcxgGIAMoCzIfLlRhbmdvLlBNUi5D",
             "b2xvckxhYi5JbnB1dExpcXVpZBI3Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAu",
             "VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZRIUCgxVc2VMaWdodElu",
-            "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4K",
-            "HGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMEh0K",
+            "FVVzZUx1YnJpY2FudFRyYW5zZm9ybRgLIAEoCEIeChxjb20udHdpbmUudGFu",
+            "Z28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -77,6 +78,7 @@ namespace Tango.PMR.ColorLab {
       useLightInks_ = other.useLightInks_;
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -191,6 +193,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 11;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as RecommendedProcessTableInput);
@@ -214,6 +227,7 @@ namespace Tango.PMR.ColorLab {
       if (UseLightInks != other.UseLightInks) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -230,6 +244,7 @@ namespace Tango.PMR.ColorLab {
       if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -271,6 +286,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(82);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(88);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -300,6 +319,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -332,6 +354,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +407,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 88: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index d89a2de1f..9e3db5c20 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml