diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 2b6632367..f5f15047c 100755
Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
index c7a9814fe..7aa42ade5 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
@@ -1833,15 +1833,23 @@ int checkDetectorType() {
     int type = atoi(buffer);
     if (type > TYPE_NO_MODULE_STARTING_VAL) {
         LOG(logERROR,
-            ("No Module attached! Expected %d for Gotthard2, got %d\n",
-             TYPE_GOTTHARD2_MODULE_VAL, type));
+            ("No Module attached! Expected %d, %d or %d for Gotthard2, got %d\n",
+             TYPE_GOTTHARD2_MODULE_VAL, 
+             TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL,
+             TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL,
+             type));
         return -2;
     }
 
-    if (abs(type - TYPE_GOTTHARD2_MODULE_VAL) > TYPE_TOLERANCE) {
+    if ((abs(type - TYPE_GOTTHARD2_MODULE_VAL) > TYPE_TOLERANCE) &&
+    (abs(type - TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL) > TYPE_TOLERANCE) &&
+    (abs(type - TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL) > TYPE_TOLERANCE)) {
         LOG(logERROR,
-            ("Wrong Module attached! Expected %d for Gotthard2, got %d\n",
-             TYPE_GOTTHARD2_MODULE_VAL, type));
+            ("Wrong Module attached! Expected %d, %d or %d for Gotthard2, got %d\n",
+             TYPE_GOTTHARD2_MODULE_VAL, 
+             TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL,
+             TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL,
+             type));
         return FAIL;
     }
     return OK;
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
index 46db18153..91293d7e3 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
@@ -26,7 +26,10 @@
 #define ADU_MAX_BITS                (12)
 #define MAX_FRAMES_IN_BURST_MODE    (2720)
 #define TYPE_GOTTHARD2_MODULE_VAL   (536)
-#define TYPE_TOLERANCE              (10)
+#define TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL   (683)
+#define TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL    (704)
+#define TYPE_GOTTHARD2_MODULE_VAL   (536)
+#define TYPE_TOLERANCE              (5)
 #define TYPE_NO_MODULE_STARTING_VAL (800)
 #define INITIAL_STARTUP_WAIT        (1 * 1000 * 1000)
 
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index c6a8752f1..178702515 100755
Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ
diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
index ef4354f82..35f53caef 100644
--- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
@@ -21,7 +21,7 @@
 #define TYPE_FILE_NAME              ("/etc/devlinks/type")
 #define DAC_MAX_MV                  (2048)
 #define TYPE_MYTHEN3_MODULE_VAL     (93)
-#define TYPE_TOLERANCE              (10)
+#define TYPE_TOLERANCE              (5)
 #define TYPE_NO_MODULE_STARTING_VAL (800)
 #define MAX_EXT_SIGNALS             (8)
 
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index ebeb6bb8c..604152c33 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -5,8 +5,8 @@
 #define APIGUI       0x210225
 #define APICTB 0x210722
 #define APIGOTTHARD 0x210722
-#define APIGOTTHARD2 0x210722
 #define APIJUNGFRAU 0x210722
-#define APIMYTHEN3 0x210722
 #define APIMOENCH 0x210722
 #define APIEIGER 0x210727
+#define APIGOTTHARD2 0x210727
+#define APIMYTHEN3 0x210727