diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0
similarity index 61%
rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3
rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0
index 5cc214ad1..2060a26d5 100755
Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0 differ
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
index b4085a0de..699f0201f 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: e9878a26ffb7e57c6e6724215e46ae5634871e64 
-Revision: 231 
-Branch: developer 
+Repsitory UUID: 372aa91aaff8c6acd0fb70a257774ac56974a4b1 
+Revision: 233 
+Branch: 2.1-rc 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 336 
-Last Changed Date: 2016-08-24 16:47:14 +0200
+Last Changed Rev: 22 
+Last Changed Date: 2016-09-22 17:16:49 +0200
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
index 72d23e86b..2f61cd1dc 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git/eigerDetectorServer"
 //#define SVNREPPATH ""
-#define SVNREPUUID "e9878a26ffb7e57c6e6724215e46ae5634871e64"
-//#define SVNREV 0x336
+#define SVNREPUUID "372aa91aaff8c6acd0fb70a257774ac56974a4b1"
+//#define SVNREV 0x22
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x336
-#define SVNDATE 0x20160824
+#define SVNREV 0x22
+#define SVNDATE 0x20160922
 //
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index 9533efa17..6dfd67b74 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -130,7 +130,7 @@ int initDetector(){
 		detectorGain[i] = default_gain_values[(int)STANDARD];
 	for(i=0;i<NOFFSET;i++)
 		detectorOffset[i] = default_offset_values[(int)STANDARD];
-	thisSettings = STANDARD;/**UNITIALIZED*/
+	thisSettings = UNINITIALIZED;
 	/*sChan=noneSelected;
   sChip=noneSelected;
   sMod=noneSelected;
@@ -731,7 +731,9 @@ int setThresholdEnergy(int ev, int imod){
 }
 
 enum detectorSettings setSettings(enum detectorSettings sett, int imod){
-	if(sett != GET_SETTINGS)
+	if(sett == UNINITIALIZED){
+		return thisSettings;
+	}if(sett != GET_SETTINGS)
 		thisSettings = sett;
 	return thisSettings;
 }
diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt
index c3236dfef..6e76b64a9 100644
--- a/slsDetectorSoftware/gitInfo.txt
+++ b/slsDetectorSoftware/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-Repsitory UUID: e9878a26ffb7e57c6e6724215e46ae5634871e64 
-Revision: 1149 
-Branch: developer 
+Repsitory UUID: 372aa91aaff8c6acd0fb70a257774ac56974a4b1 
+Revision: 1154 
+Branch: 2.1-rc 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1149 
-Last Changed Date: 2016-08-24 16:47:14 +0200
+Last Changed Rev: 1154 
+Last Changed Date: 2016-09-22 17:16:49 +0200
diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h
index 35c43465a..a89498b61 100644
--- a/slsDetectorSoftware/slsDetector/gitInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUIDLIB "e9878a26ffb7e57c6e6724215e46ae5634871e64"
-//#define SVNREV 0x1149
+#define SVNREPUUIDLIB "372aa91aaff8c6acd0fb70a257774ac56974a4b1"
+//#define SVNREV 0x1154
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTHLIB "Dhanya_Maliakal"
-#define SVNREVLIB 0x1149
-#define SVNDATELIB 0x20160824
+#define SVNREVLIB 0x1154
+#define SVNDATELIB 0x20160922
 //
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 0a423e50f..bbba27be6 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -1932,6 +1932,7 @@ int set_module(int file_des) {
 	case LOWGAIN:
 	case VERYHIGHGAIN:
 	case VERYLOWGAIN:
+	case UNINITIALIZED:
 		break;
 	default:
 		sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg);