diff --git a/EC-GN-JA-PCF-IN/pom.xml b/EC-GN-JA-PCF-IN/pom.xml
index c220a32..92d6344 100755
--- a/EC-GN-JA-PCF-IN/pom.xml
+++ b/EC-GN-JA-PCF-IN/pom.xml
@@ -180,7 +180,7 @@ of the distribution package..
                                 <servicetype>simple</servicetype>
                                 <user>root</user>
                                 <group>root</group>
-                                <execstart>%{codac_bin}/ec-gn-ja-pcf-gy.sh JAGyrotronA_FY19_P1.cfg</execstart>
+                                <execstart>%{codac_bin}/ec-gn-ja-pcf-gy.sh jada_gyro_rtapp</execstart>
                             </include>
                             <!-- Soft dependencies and service ordering -->
                             <include type="file" source="-"
@@ -191,26 +191,6 @@ of the distribution package..
 Wants=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service
 After=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service]]>
 <![CDATA[[Service]
-KillSignal=SIGINT]]>
-                            </include>
-                            <include type="service"
-                                name="ec-gn-ja-pcf-gyb"
-                                target="ec-gn-ja-services" autostart="true">
-                                <description>EC-GN-JA-PCF GYB daemon</description>
-                                <servicetype>simple</servicetype>
-                                <user>root</user>
-                                <group>root</group>
-                                <execstart>%{codac_bin}/ec-gn-ja-pcf-gy.sh JAGyrotronB_FY19_P1</execstart>
-                            </include>
-                            <!-- Soft dependencies and service ordering -->
-                            <include type="file" source="-"
-                                targetroot="SYSTEM_ROOT"
-                                target="%{_unitdir}/%{codac_service_prefix}-ec-gn-ja-pcf-gyb.service.d/override.conf"
-                                rpmeval="true">
-<![CDATA[[Unit]
-Wants=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service
-After=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service]]>
-<![CDATA[[Service]
 KillSignal=SIGINT]]>
                             </include>
                             <requires version="current">%{codac_rpm_prefix}-${project.artifactId}-lib</requires>
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
index f4f2d99..2569709 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
@@ -2613,47 +2613,46 @@
       Signals = {
         Status = {
           Type = uint32
-          NumberOfElements = 1000
         }
         GY_APS_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 0
         }
         GY_APS_I_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 1
         }
         GY_BPS_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 2
         }
         GY_BPS_I_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 3
         }
         GY_MHV_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 4
         }
         GY_MHV_I_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 5
         }
         GY_ARC1_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 6
         }
         GY_ARC2_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 7
         }
         GY_ARC3_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 8
         }
         GY_RF_V_MEAS = {
           Type = float32
-          NumberOfElements = 1000
+          ChannelId = 9
         }
       }
     }
@@ -2662,7 +2661,6 @@
       Signals = {
         PXI6368_Status = {
           Type = uint32
-          NumberOfElements = 1000
         }
         GY_APS_V_MEAS = {
           Type = float32
@@ -5350,33 +5348,43 @@
         }
         GY_APS_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_APS_I_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_BPS_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_BPS_I_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_MHV_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_MHV_I_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_ARC1_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_ARC2_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_ARC3_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
         GY_RF_V_MEAS = {
           DataSource = FastADC
+          Samples = 1000
         }
       }
       OutputSignals = {
@@ -5488,11 +5496,9 @@
         PXI6368_Status_Async = {
           Alias = PXI6368_Status
           DataSource = DDB4
-          Range = { { 0 0 } }
         }
         PXI6368_Status = {
           DataSource = DDB4
-          Range = { { 0 0 } }
         }
         GY_APS_V_MEAS_Async = {
           Alias = GY_APS_V_MEAS
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
index d5c8093..0b78f9b 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
@@ -15,47 +15,46 @@
     Signals = {
       Status = {
         Type = uint32
-        NumberOfElements = @slow_clock
       }
       GY_APS_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 0
       }
       GY_APS_I_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 1
       }
       GY_BPS_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 2
       }
       GY_BPS_I_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 3
       }
       GY_MHV_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 4
       }
       GY_MHV_I_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 5
       }
       GY_ARC1_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 6
       }
       GY_ARC2_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 7
       }
       GY_ARC3_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 8
       }
       GY_RF_V_MEAS = {
         Type = float32
-        NumberOfElements = @slow_clock
+        ChannelId = 9
       }
     }
   }
@@ -64,7 +63,6 @@
     Signals = {
       PXI6368_Status = {
         Type = uint32
-        NumberOfElements = @slow_clock
       }
       GY_APS_V_MEAS = {
         Type = float32
@@ -259,33 +257,43 @@
       }
       GY_APS_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_APS_I_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_BPS_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_BPS_I_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_MHV_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_MHV_I_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_ARC1_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_ARC2_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_ARC3_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
       GY_RF_V_MEAS = {
         DataSource = FastADC
+        Samples = @slow_clock
       }
     }
     OutputSignals = {
@@ -397,11 +405,9 @@
       PXI6368_Status_Async = {
         Alias = PXI6368_Status
         DataSource = DDB4
-        Range = { { 0, 0 } }
       }
       PXI6368_Status = {
         DataSource = DDB4
-        Range = { { 0, 0 } }
       }
       GY_APS_V_MEAS_Async = {
         Alias = GY_APS_V_MEAS
diff --git a/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh b/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh
index a7c3c44..9ef27bf 100644
--- a/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh
+++ b/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh
@@ -13,10 +13,10 @@ fi
 /bin/cp -rf ${SRC}/* ${FOLDER}
 
 cd ${FOLDER}
-make -f Makefile.cfg clean
-make -f Makefile.cfg
+#make -f Makefile.cfg clean
+#make -f Makefile.cfg
 
-CFG_FILE=${FOLDER}/${CFG}_Gen.cfg
+CFG_FILE=${FOLDER}/out/${CFG}.marte
 #TODO
 #/bin/sed -i "s/SDN_IFACE/$PON_INTERFACE_NAME/g" ${CFG_FILE} 
 #/bin/sed -i "s/TH1_CPU/$TH1_CPU/g" ${CFG_FILE}