diff --git a/header/processing/fsw_processing.h b/header/processing/fsw_processing.h
--- a/header/processing/fsw_processing.h
+++ b/header/processing/fsw_processing.h
@@ -205,23 +205,14 @@ void SM_average( float *averaged_spec_ma
     // AVERAGE SPECTRAL MATRIX
     for(i=0; i<TOTAL_SIZE_SM; i++)
     {
-//        sum = ( (int *) (ring_node_tab[0]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[1]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[2]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[3]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[4]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[5]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[6]->buffer_address) ) [ i ]
-//                + ( (int *) (ring_node_tab[7]->buffer_address) ) [ i ];
-
-        sum = ( incomingSMIsValid[BYTE_0] * ((int *)(ring_node_tab[NODE_0]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_1] * ((int *)(ring_node_tab[NODE_1]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_2] * ((int *)(ring_node_tab[NODE_2]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_3] * ((int *)(ring_node_tab[NODE_3]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_4] * ((int *)(ring_node_tab[NODE_4]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_5] * ((int *)(ring_node_tab[NODE_5]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_6] * ((int *)(ring_node_tab[NODE_6]->buffer_address) )[ i ] )
-                + ( incomingSMIsValid[BYTE_7] * ((int *)(ring_node_tab[NODE_7]->buffer_address) )[ i ] );
+        sum = INIT_FLOAT;
+        for ( k = 0; k < NB_SM_BEFORE_AVF0_F1; k++ )
+        {
+            if (incomingSMIsValid[k] == 1)
+            {
+                sum = sum + ( (int *) (ring_node_tab[0]->buffer_address) ) [ i ] ;
+            }
+        }
 
         if ( (nbAverageNORM == 0) && (nbAverageSBM == 0) )
         {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -64,8 +64,7 @@ option(FSW_debug_tch "?" OFF)
 set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
 set(SW_VERSION_N2 "1" CACHE STRING  "Choose N2 FSW Version." FORCE)
 set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-set(SW_VERSION_N4 "4" CACHE STRING  "Choose N4 FSW Version." FORCE)
-
+set(SW_VERSION_N4 "5" CACHE STRING  "Choose N4 FSW Version." FORCE)
 
 if(FSW_verbose)
 	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
diff --git a/src/fsw_init.c b/src/fsw_init.c
--- a/src/fsw_init.c
+++ b/src/fsw_init.c
@@ -153,8 +153,8 @@ rtems_task Init( rtems_task_argument ign
 
     vhdlVersion = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
     PRINTF("** VHDL                **\n")
-    PRINTF1("** %d.", vhdlVersion[1])
-    PRINTF1("%d."   , vhdlVersion[2])
+    PRINTF1("** %d-", vhdlVersion[1])
+    PRINTF1("%d-"   , vhdlVersion[2])
     PRINTF1("%d              **\n", vhdlVersion[3])
     PRINTF("*************************\n")
     PRINTF("\n\n")