diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
index e07602041..309c2a2b5 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor differ
diff --git a/slsDetectorServers/eigerDetectorServer/common.h b/slsDetectorServers/eigerDetectorServer/common.h
new file mode 120000
index 000000000..6776eb607
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/common.h
@@ -0,0 +1 @@
+../slsDetectorServer/common.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/gitInfo.txt b/slsDetectorServers/eigerDetectorServer/gitInfo.txt
index c39d4ae4d..5df7671d5 100644
--- a/slsDetectorServers/eigerDetectorServer/gitInfo.txt
+++ b/slsDetectorServers/eigerDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: e3a0c1373c5dbfd800bb8d20cbca2989222c95ad 
-Revision: 15 
+Repsitory UUID: 55c57e4c3ff61010f12f0b5a1b9a080e103f2ef3 
+Revision: 20 
 Branch: refactor 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4172 
-Last Changed Date: 2018-11-08 17:37:28.000000002 +0100 ./xfs_types.h
+Last Changed Rev: 4213 
+Last Changed Date: 2019-01-07 12:06:28.000000002 +0100 ./xparameters.h
diff --git a/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
index 654aff714..edc28e53a 100644
--- a/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "e3a0c1373c5dbfd800bb8d20cbca2989222c95ad"
+#define GITREPUUID "55c57e4c3ff61010f12f0b5a1b9a080e103f2ef3"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4172
-#define GITDATE 0x20181108
+#define GITREV 0x4213
+#define GITDATE 0x20190107
 #define GITBRANCH "refactor"
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index 655eda650..2f8476e66 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -2,6 +2,7 @@
 #include "gitInfoEiger.h"
 #include "versionAPI.h"
 #include "logger.h"
+#include "common.h"
 
 #ifndef VIRTUAL
 #include "FebControl.h"
@@ -117,7 +118,7 @@ void basictests() {
 			"Detector MAC Addr:\t\t 0x%llx\n"
 
 			"Firmware Version:\t\t %lld\n"
-			"Software Version:\t\t %llx\n"
+			"Software Version:\t\t 0x%llx\n"
 			"F/w-S/w API Version:\t\t %lld\n"
 			"Required Firmware Version:\t %d\n"
 			"Client-Software API Version:\t 0x%llx\n"
@@ -412,7 +413,6 @@ void setupDetector() {
 	FILE_LOG(logINFOBLUE, ("Setting Default Dac values\n"));
 	{
 		int i = 0;
-		int retval[2]={-1,-1};
 		const int defaultvals[NDAC] = DEFAULT_DAC_VALS;
 		for(i = 0; i < NDAC; ++i) {
 			setDAC((enum DACINDEX)i,defaultvals[i],0);
@@ -925,9 +925,6 @@ int setModule(sls_detector_module myMod, char* mess) {
 int getModule(sls_detector_module *myMod) {
 
 #ifndef VIRTUAL
-	int i;
-	int retval[2];
-
 	//trimbits
 	unsigned int* tt;
 	tt = Feb_Control_GetTrimbits();
@@ -1054,11 +1051,12 @@ int getDAC(enum DACINDEX ind, int mV) {
                 (ret[2]==ret[3]) &&
                 (ret[3]==ret[4])) {
             FILE_LOG(logINFO, ("\tvthreshold match\n"));
+            return ret[0];
         } else {
             FILE_LOG(logERROR, ("\tvthreshold mismatch vcmp_ll:%d vcmp_lr:%d vcmp_rl:%d vcmp_rr:%d vcp:%d\n",
                     ret[0],ret[1],ret[2],ret[3], ret[4]));
+            return -1;
         }
-        return;
     }
 
     if (!mV) {
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
index 5f2c35590..fd208555a 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
@@ -74,7 +74,10 @@ enum										{E_PARALLEL, E_NON_PARALLEL, E_SAFE};
 #define DEFAULT_TEST_MODE					(0)
 #define DEFAULT_HIGH_VOLTAGE				(0)
 
-#define DAC_MAX_VOLTAGE_MV                  (2048)
+#define DAC_MIN_MV                          (0)
+#define DAC_MAX_MV                          (2048)
+#define LTC2620_MIN_VAL                     (0)     // including LTC defines instead of LTC262.h (includes bit banging and blackfin read and write)
+#define LTC2620_MAX_VAL                     (4095) // 12 bits
 #define DAC_MAX_STEPS                       (4096)
 
 #define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS	(0x1FFFFFFF) /** 29 bit register for max subframe exposure value */
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index 69a3faa3c..99a03ac6d 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -1884,7 +1884,7 @@ int set_speed(int file_des) {
 	enum speedVariable ind = args[0];
 	int val = args[1];
     int GET_VAL = -1;
-    if ((ind == PHASESHIFT) || (val == ADC_PHASE) || (val == DBIT_PHASE))
+    if ((ind == PHASE_SHIFT) || (val == ADC_PHASE) || (val == DBIT_PHASE))
         GET_VAL = 100000;
 
     char speedName[20] = {0};