diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 7484330e7..ad0b236c2 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
index 2a71dbc1e..85987841b 100755
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
@@ -1523,7 +1523,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
 		memset(cDestIp, 0, MAX_STR_LENGTH);
 		sprintf(cDestIp, "%d.%d.%d.%d", (destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff);
 		FILE_LOG(logINFO, ("1G UDP: Destination (IP: %s, port:%d)\n", cDestIp, udpport));
-		if (setUDPDestinationDetails(cDestIp, udpport) == FAIL) {
+		if (setUDPDestinationDetails(0, cDestIp, udpport) == FAIL) {
 			FILE_LOG(logERROR, ("could not set udp 1G destination IP and port\n"));
 			return FAIL;
 		}
@@ -2146,7 +2146,7 @@ int startStateMachine(){
 	// 1 giga udp
 	if (!enableTenGigabitEthernet(-1)) {
 		// create udp socket
-		if(createUDPSocket() != OK) {
+		if(createUDPSocket(0) != OK) {
 			return FAIL;
 		}
 		// update header with modId, detType and version. Reset offset and fnum
@@ -2265,9 +2265,9 @@ void readandSendUDPFrames(int *ret, char *mess) {
 	FILE_LOG(logDEBUG1, ("Reading from 1G UDP\n"));
 
 	// validate udp socket
-	if (getUdPSocketDescriptor() <= 0) {
+	if (getUdPSocketDescriptor(0) <= 0) {
 		*ret = FAIL;
-		sprintf(mess,"UDP Socket not created. sockfd:%d\n", getUdPSocketDescriptor());
+		sprintf(mess,"UDP Socket not created. sockfd:%d\n", getUdPSocketDescriptor(0));
 		FILE_LOG(logERROR, (mess));
 		return;
 	}
@@ -2276,14 +2276,14 @@ void readandSendUDPFrames(int *ret, char *mess) {
 	while(readFrameFromFifo() == OK) {
 		int bytesToSend = 0, n = 0;
 		while((bytesToSend = fillUDPPacket(udpPacketData))) {
-			n += sendUDPPacket(udpPacketData, bytesToSend);
+			n += sendUDPPacket(0, udpPacketData, bytesToSend);
 		}
 		if (n >= dataBytes) {
 			FILE_LOG(logINFO, (" Frame %lld sent (%d packets, %d databytes, n:%d bytes sent)\n",
 					udpFrameNumber, udpPacketNumber + 1, dataBytes, n));
 		}
 	}
-	closeUDPSocket();
+	closeUDPSocket(0);
 }
 
 
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
index 758dfb2c1..9b116d70a 100755
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
@@ -6,7 +6,7 @@
 #define MIN_REQRD_VRSN_T_RD_API     0x181130
 #define REQRD_FRMWR_VRSN            0x190402
 
-#define CTRL_SRVR_INIT_TIME_US      (1 * 1000 * 1000)
+#define CTRL_SRVR_INIT_TIME_US      (2 * 1000 * 1000)
 
 /* Struct Definitions */
 typedef struct ip_header_struct {
diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp
index 5ba75e345..78193c807 100755
--- a/slsDetectorSoftware/src/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp
@@ -632,9 +632,9 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
     ++i;
 
     /*! \page timing
-   - <b>bsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int)
+   - <b>dsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int)
 	 */
-    descrToFuncMap[i].m_pFuncName = "bsamples";
+    descrToFuncMap[i].m_pFuncName = "dsamples";
     descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimer;
     ++i;
 
@@ -4468,7 +4468,7 @@ std::string slsDetectorCommand::cmdTimer(int narg, const char * const args[], in
         index = ANALOG_SAMPLES; 
     else if (cmd == "asamples")
         index = ANALOG_SAMPLES;
-    else if (cmd == "bsamples")
+    else if (cmd == "dsamples")
         index = DIGITAL_SAMPLES;
     else if (cmd == "storagecells")
         index = STORAGE_CELL_NUMBER;
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index e179ad818..8c2a64ecc 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -5,6 +5,6 @@
 #define APILIB 0x190405
 #define APIRECEIVER 0x190405
 #define APIGUI 0x190405
-#define APICTB 0x190528
 #define APIEIGER 0x190531
 #define APIJUNGFRAU 0x190531
+#define APICTB 0x190603