diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
index a6c4c7f..fb803ed 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
@@ -211,6 +211,10 @@
       PVName = (@rfid .. "-GAF:STAT-SHORT-PULSE")
       Type = uint32
     }
+    CCPS_IN_OPERATION = {
+      PVName = (@rfid .. "-GAF-CCPS:PSU2320-TR")
+      Type = uint8
+    }
   }
 }
 +EPICSCAOutput = {
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
index f1c1539..9c7ae79 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
@@ -128,6 +128,8 @@
     MCPS_RD_COMPLETED = {
       Type = uint8
     }
-    
+    CCPS_IN_OPERATION = {
+      Type = uint8
+    }
   }
 }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/thread_data_broker.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/thread_data_broker.marte
index 8b5d3a2..7356da8 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/thread_data_broker.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/thread_data_broker.marte
@@ -506,6 +506,9 @@
     MCPS_RD_COMPLETED = {
      DataSource = EPICSCAInput 
     }
+    CCPS_IN_OPERATION = {
+     DataSource = EPICSCAInput 
+    }
   }
   OutputSignals = {
     BPS_OUT = {
@@ -529,5 +532,8 @@
     MCPS_RD_COMPLETED = {
       DataSource = Th1Bridge
     }
+    CCPS_IN_OPERATION = {
+      DataSource = Th1Bridge
+    }
   }
 }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte
index db3c889..71a7285 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/datasync.marte
@@ -367,8 +367,8 @@
       FHPS_RU = {
         DataSource = WGAsyncBridge
       }
-      CCPS_IN_OP = {
-        DataSource = WGAsyncBridge
+      CCPS_IN_OPERATION = {
+        DataSource = Th1Bridge
       }
       MCPS_RU_COMPLETED = {
         DataSource = Th1Bridge
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
index d6139aa..e431991 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
@@ -29,24 +29,6 @@
       }
     }
   }
-  +CCPSStateONGAM = {
-    Class = ConstantGAM
-    OutputSignals = {
-      CCPS_IN_OP = {
-        DataSource = WGAsyncBridge
-        DefaultValue = 1
-      }
-    }
-  }
-  +CCPSStateOFFGAM = {
-    Class = ConstantGAM
-    OutputSignals = {
-      CCPS_IN_OP = {
-        DataSource = WGAsyncBridge
-        DefaultValue = 0
-      }
-    }
-  }
 }
 
 +Data = {
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte
index 16f5d5c..a6a5031 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/synch.marte
@@ -18,9 +18,6 @@
       FHPS_RU = {
         Type = uint8
       }
-      CCPS_IN_OP = {
-        Type = uint8
-      }
     }
   }
   +NI6259_AO = {