diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 08ba5e901..ee2771699 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -244,15 +244,6 @@ u_int32_t bus_r(u_int32_t offset) {
 
 void setMasterSlaveConfiguration(){
 
-/*
-	int masterflags = NO_MASTER;
-	int masterdefaultdelay = 62;
-	int patternphase = 0;
-	int adcphase = 0;
-	int slavepatternphase = 0;
-	int slaveadcphase = 0;
-	int sw1torstdelay = 2;
-*/
 // global master default delay picked from config file
 	FILE* fd=fopen(CONFIG_FILE,"r");
 	if(fd==NULL){
@@ -354,17 +345,15 @@ void setMasterSlaveConfiguration(){
 		setPhaseShift(slaveadcphase);
 	}
 
+	/* Set RST to SW1 delay */
+	val=bus_r(MULTI_PURPOSE_REG);
+	//#ifdef VERBOSE
+	printf("Value of multipurpose reg:%d\n",bus_r(MULTI_PURPOSE_REG));
+	//#endif
+	val = (val & (~(RST_TO_SW1_DELAY_MSK))) | ((rsttosw1delay << RST_TO_SW1_DELAY_OFFSET) & (RST_TO_SW1_DELAY_MSK));
+	bus_w(MULTI_PURPOSE_REG,val);
 
 
-	if (masterflags == IS_MASTER || masterflags == IS_SLAVE) {
-		val=bus_r(MULTI_PURPOSE_REG);
-//#ifdef VERBOSE
-		printf("Value of multipurpose reg:%d\n",bus_r(MULTI_PURPOSE_REG));
-//#endif
-		val = (val & (~(RST_TO_SW1_DELAY_MSK))) | ((rsttosw1delay << RST_TO_SW1_DELAY_OFFSET) & (RST_TO_SW1_DELAY_MSK));
-		bus_w(MULTI_PURPOSE_REG,val);
-	}
-
 	fclose(fd);
 }
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
index 0b0fd3c25..331da9c31 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer 
 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: a0ae3985068425e7142df8271eac6ce09a238dc9 
-Revision: 206 
+Repsitory UUID: e4fa807b5d987714a047b9d2cac271c89f6c2fef 
+Revision: 208 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1454 
-Last Changed Date: 2017-08-04 09:28:44.000000002 +0200 ./firmware_funcs.c
+Last Changed Rev: 1487 
+Last Changed Date: 2017-08-16 16:01:46.000000002 +0200 ./firmware_funcs.c
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
index b1430c924..f5a2ab5e4 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "a0ae3985068425e7142df8271eac6ce09a238dc9"
-//#define SVNREV 0x1454
+#define SVNREPUUID "e4fa807b5d987714a047b9d2cac271c89f6c2fef"
+//#define SVNREV 0x1487
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x1454
-#define SVNDATE 0x20170804
+#define SVNREV 0x1487
+#define SVNDATE 0x20170816
 //
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.4 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.4
deleted file mode 100755
index 4d2a29ceb..000000000
Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.4 and /dev/null differ
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5
new file mode 100755
index 000000000..e802907cb
Binary files /dev/null and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5 differ