diff --git a/sources/Stations/DuCollege.h b/sources/Stations/DuCollege.h
index 67c9528..41c9de5 100644
--- a/sources/Stations/DuCollege.h
+++ b/sources/Stations/DuCollege.h
@@ -29,7 +29,7 @@
 #define DuCollege_H
 #include "Station.h"
 
-#define DUCOLLEGE_STATION_KEY 0x0011111 //JFM A CONFIRMER...
+#define DUCOLLEGE_STATION_KEY 0x0058000
 #define DUCOLLEGE_NB_EXTERNAL_INPUT_430_MODULES 1
 #define DUCOLLEGE_NB_EXTERNAL_OUTPUT_440_MODULES 1
 #define DUCOLLEGE_NB_EXTERNAL_MIXED_470_MODULES 0
diff --git a/sources/Stations/Montmorency.h b/sources/Stations/Montmorency.h
index 164e387..e6ed41f 100644
--- a/sources/Stations/Montmorency.h
+++ b/sources/Stations/Montmorency.h
@@ -64,12 +64,12 @@
 #define MONTMORENCY_IN_ZT1_ARF_MASK		0x00002000
 #define MONTMORENCY_IN_ZT2_ARF_MASK		0x00004000
 #define MONTMORENCY_IN_STATION_ID_MASK	0x00078000
-#define MONTMORENCY_IN_CDV_21AB_MASK	0x00080000
-#define MONTMORENCY_IN_10_22_AN1_MASK	0x00100000  //Unused duplicate status of CDV10B introduced by error when merging the two ZT.  Should be AN1 if needed...
-#define MONTMORENCY_IN_CDV_22BC_MASK	0x00200000
-#define MONTMORENCY_IN_ZT1_10_22_ITI_MASK 0x00400000
-#define MONTMORENCY_IN_CDV_22A_MASK     0x00800000
-#define MONTMORENCY_IN_CDV_11AP_MASK    0x01000000   //Unused duplicate status of CDV11A introduced by error when merging the two ZT
+#define MONTMORENCY_IN_CDV_21AB_MASK	0x00080000  //22.1
+#define MONTMORENCY_IN_10_22_AN1_MASK	0x00100000  // 22.2//Unused duplicate status of CDV10B introduced by error when merging the two ZT.  Should be AN1 if needed...
+#define MONTMORENCY_IN_CDV_22BC_MASK	0x00200000  //23.1
+#define MONTMORENCY_IN_ZT1_10_22_ITI_MASK 0x00400000 //23.2
+#define MONTMORENCY_IN_CDV_22A_MASK     0x00800000  //24.1
+#define MONTMORENCY_IN_CDV_11AP_MASK    0x01000000  //24.2 //Unused duplicate status of CDV11A introduced by error when merging the two ZT
 
 //External (ethernet) output module masks for MONTMORENCY
 #define MONTMORENCY_OUT_VP1_MASK		0x00000001
diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp
index e9a137e..89ef525 100644
--- a/sources/Zonetest.cpp
+++ b/sources/Zonetest.cpp
@@ -221,7 +221,12 @@ unsigned int CZoneTest::ExecStateMachine(eZTSMEvents_t)
             //Initiate a system reboot
             mZTStateMachineTimer->stop();
             mInternalWatchdog->StopWatchdog();
-            system("reboot");
+
+            //Initiate a system reboot
+            system("shutdown -r now");
+            //system("reboot");     //Not working well all the times
+
+
 
             QApplication::exit(80); //Quit the application
             break;
@@ -725,14 +730,14 @@ unsigned int CZoneTest::InitStation()
         {
             StationName = "LONGUEIL";
         }
-//        else if((key & MONTMORENCY_IN_STATION_ID_MASK) == MONTMORENCY_STATION_KEY)
-//        {
-//            StationName = "MONTMORENCY";
-//        }
-        else if((key & MONTMORENCY1012_IN_STATION_ID_MASK) == MONTMORENCY1012_STATION_KEY)
+        else if((key & MONTMORENCY_IN_STATION_ID_MASK) == MONTMORENCY_STATION_KEY)
         {
-            StationName = "MONTMORENCY_10_12";
+            StationName = "MONTMORENCY";
         }
+//        else if((key & MONTMORENCY1012_IN_STATION_ID_MASK) == MONTMORENCY1012_STATION_KEY)
+//        {
+//            StationName = "MONTMORENCY_10_12";
+//        }
         else if((key & MONTMORENCY1022_IN_STATION_ID_MASK) == MONTMORENCY1022_STATION_KEY)
         {
             StationName = "MONTMORENCY_10_22";