diff --git a/cfg/per-class/classH1.cfg b/cfg/per-class/classH1.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..8db1a00032261dc7fb6059a3908f45e239619d40
--- /dev/null
+++ b/cfg/per-class/classH1.cfg
@@ -0,0 +1,13 @@
+# ======== Luma adaptive QP ==========
+LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
+isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
+
+# ======= LMCS =======================
+LumaReshapeEnable             : 0            # turned off in HDR CTC 
+
+#======== Chroma QP scale ============
+WCGPPSEnable                  : 1           # enable WCG Chroma scale
+WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
+WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
+WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
+WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
diff --git a/cfg/per-class/classH2.cfg b/cfg/per-class/classH2.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..babeabd73a3d17eed34ef549b4955ea80a89ea45
--- /dev/null
+++ b/cfg/per-class/classH2.cfg
@@ -0,0 +1,9 @@
+# ======== Luma adaptive QP ========
+LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
+
+# ======= LMCS =======================
+LumaReshapeEnable             : 0           # turned off in HDR CTC 
+ReshapeSignalType             : 2           # set signal type to HLG if enabled
+
+#======== Chroma QP scale ============
+WCGPPSEnable                  : 0           # enable WCG Chroma scale
diff --git a/cfg/per-sequence-HDR/H1_BalloonFestival.cfg b/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
index 150521a880c2e700e4a085dbf1c7944eecef4044..ad5aa2663a0a8ca924b56e382db9bd04ebee9abc 100644
--- a/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
+++ b/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
@@ -9,15 +9,3 @@ SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 240         # Number of frames to be coded
 
 Level                         : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg b/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
index 540461fa8e9a2dc715e746f3616f3bef47b5e7ef..47162c8d732f10c609199d172b1a0cb2fa0657f8 100644
--- a/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
+++ b/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
@@ -11,12 +11,5 @@ FramesToBeEncoded             : 240         # Number of frames to be coded
 Level                         : 4.1
 
 #======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
 WCGPPSCbQpScale               : 1.04        # Scale factor depending on capture and representation color space
 WCGPPSCrQpScale               : 1.39        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg b/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
index 4d1f44ef8932ffdc459d96074fa26b882a39db8b..0f0b8e4f14b575199c0e83de4055af98a4511889 100644
--- a/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
+++ b/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
@@ -9,14 +9,3 @@ SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
 
 Level                         : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_EBU_Starting.cfg b/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
index 34505213bf9a2b06f1136744183452662b8e5e60..701df4b7e6b522d0862f9de5b8a4f5b8a9f0c33d 100644
--- a/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
+++ b/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
@@ -9,14 +9,3 @@ SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
 
 Level                         : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_Market.cfg b/cfg/per-sequence-HDR/H1_Market.cfg
index 56b955537bc3ca755beb5abfde571a49e846196e..c4675e6fd4af0ff5f20705ffcbfb34dccf324800 100644
--- a/cfg/per-sequence-HDR/H1_Market.cfg
+++ b/cfg/per-sequence-HDR/H1_Market.cfg
@@ -9,14 +9,3 @@ SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 400         # Number of frames to be coded
 
 Level                         : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_ShowGirl.cfg b/cfg/per-sequence-HDR/H1_ShowGirl.cfg
index 2a6ff3d3d22de6c6cfdac7ad8b8d545baa3d185f..1f7c5222ab4ea3adc9e382aacd597b77cef51561 100644
--- a/cfg/per-sequence-HDR/H1_ShowGirl.cfg
+++ b/cfg/per-sequence-HDR/H1_ShowGirl.cfg
@@ -11,12 +11,5 @@ FramesToBeEncoded             : 339         # Number of frames to be coded
 Level                         : 4.1
 
 #======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
 WCGPPSCbQpScale               : 1.04        # Scale factor depending on capture and representation color space
 WCGPPSCrQpScale               : 1.39        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H1_SunRise.cfg b/cfg/per-sequence-HDR/H1_SunRise.cfg
index 31c70dfb7a9a7992b0e74b01e63257ba7f99d344..7f6bb5b28882d05a59c8595a44ece14da03bc735 100644
--- a/cfg/per-sequence-HDR/H1_SunRise.cfg
+++ b/cfg/per-sequence-HDR/H1_SunRise.cfg
@@ -9,14 +9,3 @@ SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 200         # Number of frames to be coded
 
 Level                         : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 1           # enable WCG Chroma scale
-WCGPPSChromaQpScale           : -0.46       # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset          : 9.26        # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale               : 1.14        # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale               : 1.79        # Scale factor depending on capture and representation color space 
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 1           # Change luma delta QP based on average luma
-isSDR                         : 0           # 1: SDR in PQ container,   0: HDR
diff --git a/cfg/per-sequence-HDR/H2_DayStreet.cfg b/cfg/per-sequence-HDR/H2_DayStreet.cfg
index 58a92baa6581a3dbffad0f3fefc31d584c2d74af..99e77a0fe91e46fe518ce78c3cbeff3b64c8db3c 100644
--- a/cfg/per-sequence-HDR/H2_DayStreet.cfg
+++ b/cfg/per-sequence-HDR/H2_DayStreet.cfg
@@ -9,10 +9,3 @@ SourceHeight                  : 2160        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
 
 Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg b/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg
deleted file mode 100644
index 1ee6bf149bdcec1310f78583e87f916d484443c8..0000000000000000000000000000000000000000
--- a/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile                     : DayStreet_3840x2160_60p_10bit_420_hlg.yuv
-InputBitDepth                 : 10          # Input bitdepth
-InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
-FrameRate                     : 60          # Frame Rate per second
-FrameSkip                     : 0           # Number of frames to be skipped in input
-SourceWidth                   : 3840        # Input  frame width
-SourceHeight                  : 2160        # Input  frame height
-FramesToBeEncoded             : 600         # Number of frames to be coded
-
-Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg b/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
similarity index 73%
rename from cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg
rename to cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
index f029fea88c93367b4fbf3dd38bc811e79c58cdba..18f8fb078878b7a313402f03ff5226e16d3f79c9 100644
--- a/cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg
+++ b/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
@@ -9,10 +9,3 @@ SourceHeight                  : 2160        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
 
 Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
index 67db9625ae551783cac173ccd3b542ab288ac4c2..9412ad6837f8765d4bfc722e1ad9d1fefa5b74fa 100644
--- a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
+++ b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
@@ -9,10 +9,3 @@ SourceHeight                  : 2160        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
 
 Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg
deleted file mode 100644
index 18f585160328263f3a6ea32188d5e8465490f70c..0000000000000000000000000000000000000000
--- a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile                     : PeopleInShoppingCenter_3840x2160_60p_10bit_420_hlg.yuv
-InputBitDepth                 : 10          # Input bitdepth
-InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
-FrameRate                     : 60          # Frame Rate per second
-FrameSkip                     : 0           # Number of frames to be skipped in input
-SourceWidth                   : 3840        # Input  frame width
-SourceHeight                  : 2160        # Input  frame height
-FramesToBeEncoded             : 600         # Number of frames to be coded
-
-Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg b/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
index 50fa5c60946351a767b47dba980c6cb9987b86b3..c673c0e9e890295fb5af84cb8f0f08c69bab1dc0 100644
--- a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
+++ b/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
@@ -9,9 +9,3 @@ SourceHeight                  : 2160        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
 
 Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
\ No newline at end of file
diff --git a/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg b/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg
deleted file mode 100644
index d85a664678cd714c9acf9e1f54312492228a6fc8..0000000000000000000000000000000000000000
--- a/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile                     : SunsetBeach2_3840x2160p_60_10b_HLG_420.yuv
-InputBitDepth                 : 10          # Input bitdepth
-InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
-FrameRate                     : 60          # Frame Rate per second
-FrameSkip                     : 0           # Number of frames to be skipped in input
-SourceWidth                   : 3840        # Input  frame width
-SourceHeight                  : 2160        # Input  frame height
-FramesToBeEncoded             : 600         # Number of frames to be coded
-
-Level                         : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable                  : 0           # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode        : 0           # Change luma delta QP based on average luma
-