diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp
index 5acf2c7..f369854 100644
--- a/EpdBase3/Epd3Base.cpp
+++ b/EpdBase3/Epd3Base.cpp
@@ -41,18 +41,10 @@ Epd3Base::Epd3U* current;
 
 
 
-//bool status = RunComsTransaction(
-//	[&]() {
-//		return BeginReadTotalDoses(epdComsHandle, nullptr, 0, nullptr);
-//	},
-//	[&](auto token) {
-//		return EndReadTotalDoses(epdComsHandle, token, totdoses, MaxDoses, &numtotDoses, &utc);
-//	}
-//);
 
 void Epd3Base::Epd3U::resetErrors()
 {
-	errorm009 = errorm007 = errorm102 = errorm202 = error_other = 0;
+	errorm009 = errorm007 = errorm102 = errorm200=  errorm202 = error_other = 0;
 }
 
 void Epd3Base::Epd3U::incrementError(int rv)
@@ -62,6 +54,7 @@ void Epd3Base::Epd3U::incrementError(int rv)
 		case -7: errorm007++; break;
 		case -9: errorm009++; break;
 		case -102: errorm102++; break;
+		case -200: errorm200++;; break;
 		case -202: errorm202++; break;
 		case -999: error_other++; break;
 		default: error_other++; break;
@@ -336,16 +329,17 @@ int Epd3Base::Epd3U::DisconnectAndConnect()
 		SetFunctionReturnValue(fDisconnect, 1, 0);
 		rv = Disconnect(epdComsHandle);
 		SetEndReturnValue(rv);
+		Sleep(10);
 	}
 
 	int  retry=0; rv = 1;
 	while (rv && retry++< ReconnectRetries) {
 		Sleep(SleepBeforeReconnect);
-		SetFunctionReturnValue(fConnect, 1,1);
+		SetFunctionReturnValue(fConnect, 1,retry);
 		rv = Connect33(epdComsHandle, Epd, true);
 		SetEndReturnValue(rv);
 		DebugWrite("****    DisconnectAndConnect rv={} retry {} ****\n", rv, retry);
-		}
+	}
 	if (!rv) isConnected = true;
 
 	return rv;
@@ -561,7 +555,7 @@ int Epd3Base::Epd3U::ReConnect()
 {
 	if (epdComsHandle != nullptr)
 	{
-
+		Sleep(10);
 		SetFunctionReturnValue(fConnect, 0);
 		Dll3RV = Connect33(epdComsHandle, Epd, true);
 		SetEndReturnValue(Dll3RV);
@@ -792,21 +786,6 @@ int  Epd3Base::Epd3U::SetTime() //Only R3
 	return r;
 }
 
-//void WINAPI ReadStatusCompletion(CommsHandle hComms, CompletionToken token)
-//{
-//	int  rv = EndReadStatus(current->epdComsHandle, token, &current->epd3status);
-//	rv = current->SetEndReturnValue(rv);
-//	current->StatusDecoded = false;
-//	current->IssueCount = current->epd3status.IssueCount;
-//	current->OperatingStatus = current->epd3status.OperatingStatus;
-//	current->AlarmStatus = current->epd3status.AlarmStatus;
-//	current->ErrorStatus = current->epd3status.FaultStatus;
-//	current->OtherAlarms = current->epd3status.OtherBits;
-//	current->DecodeStatus();	//Alarm status...
-//	DebugWrite("****    ReadStatusCompletion {:x}    ****\n", (uint32_t)current->OperatingStatus);
-//	SetEvent(current->hCompletion);
-//}
-
 int Epd3Base::Epd3U::ReadStatusOnly()
 {
 	EPDStep = EpdSteps::StepReadStatus;
@@ -827,20 +806,7 @@ int Epd3Base::Epd3U::ReadStatusOnly()
 			return EndReadStatus(epdComsHandle, token, &epd3status);
 		}, 10
 		);
-	/*SetFunctionReturnValue(eFunctions::ReadStatusOnly, 0);
-	token = BeginReadStatus(epdComsHandle, nullptr);
-	rv = CommitAndSetRV();
-	if (!rv) rv = EndReadStatus(epdComsHandle, token, &epd3status); 
-	rv = SetEndReturnValue(rv);
-	if (rv) {
-		if (rv == r_ErrorNotConnected || !isConnected) 
-			rv = ReConnect();
-		SetFunctionReturnValue(eFunctions::ReadStatusOnly, 1);
-		token = BeginReadStatus(epdComsHandle, nullptr);
-		rv = CommitAndSetRV();
-		if (!rv) rv = EndReadStatus(epdComsHandle, token, &epd3status);
-		rv = SetEndReturnValue(rv);
-	}*/
+
 	
 	if (rv) {
 		EPDStepResult = EpdStepResults::Error;
@@ -901,7 +867,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 	
 	memset(&epd3status, 0, sizeof(StatusData_t));
 	
-	int rv2;
+
 	if (!isConnected) {
 		rv = ReConnect();
 		if (rv != 0) {
@@ -921,23 +887,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::ReadStatus,0);
-	token = BeginReadStatus(epdComsHandle, nullptr);
-	rv = CommitAndSetRV();
-	if (!rv)
-		rv = EndReadStatus(epdComsHandle, token, &epd3status);
-	rv2 = SetEndReturnValue(rv);
-
-	if (rv ) {
-		if (rv == r_ErrorNotConnected || !isConnected)  
-			rv = ReConnect();
-
-		token = BeginReadStatus(epdComsHandle, nullptr);
-		rv = CommitAndSetRV();
-		if (!rv) rv = EndReadStatus(epdComsHandle, token, &epd3status);
-		rv = SetEndReturnValue(rv);
-
-	}*/
+	
 
 	current->StatusDecoded = false;
 	if (rv) {
@@ -958,22 +908,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::ReadVoltages, 0);
-	token = BeginReadVoltages(epdComsHandle, nullptr);
-	rv = CommitAndSetRV();
-	if (!rv)
-		rv = EndReadVoltages(epdComsHandle, token, &vbat0, &vbat1, &vcpu);
 	
-	rv2 = SetEndReturnValue(rv);
-	if (rv) {
-		if (rv == r_ErrorNotConnected || !isConnected) 
-			rv = ReConnect();
-
-		token = BeginReadVoltages(epdComsHandle, nullptr);
-		rv = CommitAndSetRV();
-		if (!rv) rv = EndReadVoltages(epdComsHandle, token, &vbat0, &vbat1, &vcpu);
-		rv = SetEndReturnValue(rv);
-	}*/
 	
 	if (progressCallback) progressCallback(EPDStep, EPDStepResult);
 
@@ -1007,15 +942,11 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 			return BeginReadEpdIdentities(epdComsHandle, nullptr);
 		},
 		[&](auto token) {
-			return  EndReadEpdIdentities(epdComsHandle, token, &EpdID32, (EpdTypes*)&EpdType, &capabilities, &MarkNumber, &VersionNumber, NULL, 0);
-		}, 10
+			return  EndReadEpdIdentities(epdComsHandle, token, &EpdID32, reinterpret_cast<EpdTypes*>(&EpdType), &capabilities, &MarkNumber, &VersionNumber, nullptr, 0);
+		}, 20
 	);
 
-	//SetFunctionReturnValue(ReadEpdIdentities,0);
-	//token = BeginReadEpdIdentities(epdComsHandle, nullptr);
-	//rv = CommitAndSetRV();
-	//if (!rv) rv = EndReadEpdIdentities(epdComsHandle, token, &EpdID32, (EpdTypes*)&EpdType, &capabilities, &MarkNumber, &VersionNumber, NULL, 0);
-	//rv = SetEndReturnValue(rv);
+	
 
 	if (rv != 0) {
 		EPDStepResult = EpdStepResults::Error;
@@ -1048,13 +979,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(ReadCounts,0);
-	token = BeginReadCounts(epdComsHandle, nullptr, 0, nullptr);
-	rv = CommitAndSetRV();
-	if (!rv) {
-		rv = EndReadCounts(epdComsHandle, token, Counts, MaxCounts, &countsRead, &utc, &seconds);
-		rv = SetEndReturnValue(rv);
-	}*/
+
 	if (rv) {
 	
 		EPDStepResult = EpdStepResults::Error;
@@ -1079,13 +1004,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 			}, 10
 		);
 
-		//SetFunctionReturnValue(ReadRTC,0);
-		//token = BeginReadRTC(epdComsHandle, nullptr);
-		//rv = CommitAndSetRV();
-		//if (!rv) {
-		//	rv = EndReadRTC(epdComsHandle, token, &utc); //EpdClock for MK2
-		//	rv = SetEndReturnValue(rv);
-		//}
+		
 		if (rv) {
 			EPDStepResult = EpdStepResults::Error;
 			goto error;
@@ -1121,13 +1040,6 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 			}, 10
 		);
 
-		/*SetFunctionReturnValue(ReadWearerId, 0);
-		token = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Name), nullptr);
-		rv = CommitAndSetRV();
-		if (!rv) {
-			rv = EndReadWearerId(epdComsHandle, token, &mk3WearerID);
-			rv = SetEndReturnValue(rv);
-		}*/
 
 		if (rv != 0) {
 			EPDStepResult = EpdStepResults::Error;
@@ -1149,13 +1061,7 @@ int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 			}, 10
 		);
 
-		/*SetFunctionReturnValue(ReadWearerId, 0);
-		token = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Primary), nullptr);
-		rv = CommitAndSetRV();
-		if (!rv) {
-			rv = EndReadWearerId(epdComsHandle, token, &mk3WearerID);
-			rv = SetEndReturnValue(rv);
-		}*/
+
 		if (rv != 0) {
 			EPDStepResult = EpdStepResults::Error;
 			goto error;
@@ -2081,20 +1987,6 @@ WORD Epd3Base::Epd3U::ReadAlarmTresholds() {
 	);
 
 
-	/*SetFunctionReturnValue(eFunctions::ReadAlarmThresholds,0);
-	token = BeginReadAlarmThresholds(epdComsHandle, (uint8_t)hp10tresholds.MeasId, nullptr, 0, nullptr);
-	r = CommitAndSetRV();
-	if (!r)  r = EndReadAlarmThresholds(epdComsHandle, token, &hp10tresholds);	
-	r= SetEndReturnValue(r); 
-	decodeTreshold(&hp10tresholds);
-	if (r) {
-		r = ReConnect();
-		SetFunctionReturnValue(eFunctions::ReadAlarmThresholds, 0, 1);
-		token = BeginReadAlarmThresholds(epdComsHandle, (uint8_t)hp10tresholds.MeasId, nullptr, 0, nullptr);
-		r = CommitAndSetRV();
-		if (!r)  r = EndReadAlarmThresholds(epdComsHandle, token, &hp10tresholds);
-		r = SetEndReturnValue(r);
-	}*/
 	return r;
 }
 
@@ -2118,15 +2010,6 @@ WORD Epd3Base::Epd3U::WriteAlarmTresholds() {
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::WriteAlarmThresholdsHP10, 0, 0);
-	token = BeginWriteAlarmThresholds(epdComsHandle, (uint8_t)hp10tresholds.MeasId, (uint8_t)hp10tresholds.NumberThresholds, hp10tresholds.Thresholds, nullptr);
-	r = CommitAndEnd2RV(EndWriteAlarmThresholds, token);
-	if (r) {
-		r = ReConnect();
-		SetFunctionReturnValue(eFunctions::WriteAlarmThresholdsHP10, 0, 1);
-		token = BeginWriteAlarmThresholds(epdComsHandle, (uint8_t)hp10tresholds.MeasId, (uint8_t)hp10tresholds.NumberThresholds, hp10tresholds.Thresholds, nullptr);
-		r = CommitAndEnd2RV(EndWriteAlarmThresholds, token);
-	}*/
 
 	if (r != 0)
 		goto error;
@@ -2146,15 +2029,7 @@ WORD Epd3Base::Epd3U::WriteAlarmTresholds() {
 		}, 10
 	);
 
-	//SetFunctionReturnValue(eFunctions::WriteAlarmThresholdsHP07,0,0);
-	//token = BeginWriteAlarmThresholds(epdComsHandle, (uint8_t)hp07tresholds.MeasId, (uint8_t)hp07tresholds.NumberThresholds, hp07tresholds.Thresholds, nullptr);
-	//r = CommitAndEnd2RV(EndWriteAlarmThresholds, token,100);
-	//if (r) {
-	//	r = ReConnect();
-	//	SetFunctionReturnValue(eFunctions::WriteAlarmThresholdsHP07, 0, 1);
-	//	token = BeginWriteAlarmThresholds(epdComsHandle, (uint8_t)hp07tresholds.MeasId, (uint8_t)hp07tresholds.NumberThresholds, hp07tresholds.Thresholds, nullptr);
-	//	r = CommitAndEnd2RV(EndWriteAlarmThresholds, token,100);
-	//}
+	
 	if (r != 0)		
 		goto error;
 
@@ -2209,18 +2084,9 @@ WORD Epd3Base::Epd3U::DeIssue()
 			},
 			[&](auto token) {
 				return  EndDeissueEPD(epdComsHandle, token);
-			}, 10
+			}, 20
 		);
 
-		/*SetFunctionReturnValue(eFunctions::DeissueEPD, 0);
-		token = BeginDeissueEPD(epdComsHandle, nullptr);
-		r = CommitAndEnd2RV(EndDeissueEPD, token);
-		if (r) {
-			SetFunctionReturnValue(eFunctions::DeissueEPD, 0,1);
-			token = BeginDeissueEPD(epdComsHandle, nullptr);
-			r = CommitAndEnd2RV(EndDeissueEPD, token);
-		}*/
-		
 		if (r == 0)
 			EPDStepResult = EpdStepResults::OK; 
 		else 	
@@ -2232,24 +2098,7 @@ WORD Epd3Base::Epd3U::DeIssue()
 
 	Sleep(100);
 	r = SetEpdOFF();
-	//r = RunComsTransaction(eFunctions::EpdOff, 0,
-	//	[&]() {
-	//		return BeginEpdOnOff(epdComsHandle, 0, nullptr);
-	//	},
-	//	[&](auto token) {
-	//		return  EndEpdOnOff(epdComsHandle, token);
-	//	}, 10
-	//);
-
-	/*SetFunctionReturnValue(eFunctions::EpdOff,0);
-	token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
-	r = CommitAndEnd2RV(EndEpdOnOff, token);
-	if (r) {
-		SetFunctionReturnValue(eFunctions::EpdOff, 0,1);
-		r = ReConnect();
-		token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
-		r = CommitAndEnd2RV(EndEpdOnOff, token);
-	}*/
+	
 	
 	
 	if (r) goto error;
@@ -2276,15 +2125,7 @@ WORD Epd3Base::Epd3U::WriteWearer() {
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::SetBaselineCounters,0);
-	token = BeginSetBaselineCounters(epdComsHandle, nullptr);
-	r = CommitAndEnd2RV(EndSetBaselineCounters, token);
 	
-	if (r) {
-		if (r == r_ErrorNotConnected) r = ReConnect();
-		token = BeginSetBaselineCounters(epdComsHandle, nullptr);
-		r = CommitAndEnd2RV(EndSetBaselineCounters, token);
-	}*/
 	
 	if (r != 0)
 		goto error;
@@ -2305,16 +2146,7 @@ WORD Epd3Base::Epd3U::WriteWearer() {
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::WriteWearerIdName,0);
-	token = BeginWriteWearerId(epdComsHandle, mk3WearerID, nullptr);
-	r = CommitAndEnd2RV(EndWriteWearerId, token, 100	);
 	
-	if (r) {
-		if (r == r_ErrorNotConnected) r = ReConnect();
-		SetFunctionReturnValue(eFunctions::WriteWearerIdName, 1);
-		token = BeginWriteWearerId(epdComsHandle, mk3WearerID, nullptr);
-		r = CommitAndEnd2RV(EndWriteWearerId, token);
-	}*/
 	if (r != 0)
 		goto error;
 
@@ -2331,16 +2163,7 @@ WORD Epd3Base::Epd3U::WriteWearer() {
 		}, 10
 	);
 
-	/*SetFunctionReturnValue(eFunctions::WriteWearerIdPrimary,0);
-	token = BeginWriteWearerId(epdComsHandle, mk3WearerID, nullptr);
-	r = CommitAndEnd2RV(EndWriteWearerId, token);
 	
-	if (r) {
-		if (r == r_ErrorNotConnected) r = ReConnect();
-		SetFunctionReturnValue(eFunctions::WriteWearerIdPrimary, 1);
-		token = BeginWriteWearerId(epdComsHandle, mk3WearerID, nullptr);
-		r = CommitAndEnd2RV(EndWriteWearerId, token);
-	}*/
 	if (r != 0)
 		goto error;
 
@@ -2438,7 +2261,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)  //normaal is preparedone=tru
 		},
 		[&](auto token) {
 			return  EndIssueEPD(epdComsHandle, token);
-		}, 500
+		}, 400
 	);
 
 	/*SetFunctionReturnValue(eFunctions::IssueEPD,0,0);
@@ -2501,7 +2324,7 @@ WORD Epd3Base::Epd3U::EPDReadExtraStatus()
 		},
 		[&](auto token) {
 			return EndReadBaselineCounts(epdComsHandle, token, Counts, 10, &utc, &countsRead);
-		}, 100
+		}, 10
 	);
 
 	//SetFunctionReturnValue(eFunctions::ReadBaselineCounts,0);
@@ -2537,7 +2360,7 @@ WORD Epd3Base::Epd3U::WriteCal()
 			},
 			[&](auto token) {
 				return EndMfrLogin_R2(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
 	/*	SetFunctionReturnValue(eFunctions::MfrLogin_R2,0);
@@ -2552,12 +2375,10 @@ WORD Epd3Base::Epd3U::WriteCal()
 			},
 			[&](auto token) {
 				return EndWriteSensitivities_R2(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
-		//SetFunctionReturnValue(eFunctions::WriteSensitivities_R2,0);
-		//token = BeginWriteSensitivities_R2(epdComsHandle, nullptr, (uint16_t)K1, (uint16_t)K2, (uint16_t)K3, (uint16_t)K4, (uint16_t)K5, (uint16_t)K6);
-		//r = CommitAndEnd2RV(EndWriteSensitivities_R2, token);
+
 		if (r != 0)
 			goto error;
 	} else 
@@ -2579,7 +2400,7 @@ WORD Epd3Base::Epd3U::WriteCal()
 				},
 				[&](auto token) {
 					return EndWriteAccessLevel(epdComsHandle, token);
-				}, 100
+				}, 10
 			);
 
 		//SetFunctionReturnValue(eFunctions::WriteAccessLevelAdmin, 0);
@@ -2605,7 +2426,7 @@ WORD Epd3Base::Epd3U::WriteCal()
 			},
 			[&](auto token) {
 				return EndWriteGains(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 		//SetFunctionReturnValue(eFunctions::WriteGains_R3, 0);
 		//token = BeginWriteGains(epdComsHandle, gains, numGains, nullptr);
@@ -2687,22 +2508,9 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain, float ChirpRate)
 
 	//if (DetectorsOn) {
 	rv = SetEpdOFF();
-		//rv = RunComsTransaction(eFunctions::EpdOff, 0,
-		//	[&]() {
-		//		return  BeginEpdOnOff(epdComsHandle, 0, nullptr);
-		//	},
-		//	[&](auto token) {
-		//		return EndEpdOnOff(epdComsHandle, token);
-		//	}, 100
-		//);
-
-		//SetFunctionReturnValue(eFunctions::EpdOff, 0);
-		//token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
-		//rv = CommitAndEnd2RV(EndEpdOnOff, token);
-		Sleep(200);
-		if (!isConnected) rv = ReConnect();
-		DetectorsOn = 0;
-	//}
+	Sleep(10);
+	if (!isConnected) rv = ReConnect();
+	DetectorsOn = 0;
 	if (rv)
 		goto error;
 
@@ -2802,7 +2610,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 			},
 			[&](auto token) {
 				return EndWriteAccessLevel(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
 		/*SetFunctionReturnValue(eFunctions::WriteAccessLevelAdmin, 0);
@@ -2825,7 +2633,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 				},
 				[&](auto token) {
 					return EndWriteQuickAccessDisplays_R3(epdComsHandle, token);
-				}, 100
+				}, 10
 			);
 
 			//SetFunctionReturnValue(eFunctions::WriteQuickAccessDisplays_R3, 1);
@@ -2838,19 +2646,16 @@ int Epd3Base::Epd3U::WriteConfig(void)
 		Error = r;
 	if (!r && isAdmin) {
 
-		r = RunComsTransaction(eFunctions::EnableTestSound, 0,
-			[&]() {
-				return   BeginEnableTestSound_R3(epdComsHandle, 1, nullptr);
-			},
-			[&](auto token) {
-				return EndEnableTestSound_R3(epdComsHandle, token);
-			}, 100
-		);
-
-		/*SetFunctionReturnValue(eFunctions::EnableTestSound, 1);
-		token = BeginEnableTestSound_R3(epdComsHandle, 1, nullptr);
-		r = CommitAndEnd2RV(EndEnableTestSound_R3, token);*/
-
+		if (SoftVersion >= 2) {
+			r = RunComsTransaction(eFunctions::EnableTestSound, 0,
+				[&]() {
+					return BeginEnableTestSound_R3(epdComsHandle, 1, nullptr);
+				},
+				[&](auto token) {
+					return EndEnableTestSound_R3(epdComsHandle, token);
+				}, 100
+			);
+		}
 	}
 	
 	if (!r && isAdmin) {
@@ -2861,7 +2666,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 			},
 			[&](auto token) {
 				return EndWriteDoseProfileInterval(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
 		/*SetFunctionReturnValue(eFunctions::WriteDoseProfileInterval, 1);
@@ -2909,7 +2714,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 			},
 			[&](auto token) {
 				return EndWriteDisplayEnables_R3(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
 		/*SetFunctionReturnValue(eFunctions::WriteDisplayEnables_R3,1);
@@ -2963,7 +2768,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 				},
 				[&](auto token) {
 					return EndWriteAlarmConfiguration_R3(epdComsHandle, token);
-				}, 100
+				}, 10
 			);
 
 			//SetFunctionReturnValue(eFunctions::WriteAlarmConfiguration_R3, 1);
@@ -2992,7 +2797,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 			},
 			[&](auto token) {
 				return EndWriteOffModeDisplay_R3(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
 		//SetFunctionReturnValue(eFunctions::WriteOffModeDisplay_R3,1);
@@ -3017,7 +2822,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 			},
 			[&](auto token) {
 				return EndWriteAccessLevel(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 		
 			//SetFunctionReturnValue(eFunctions::WriteAccessLevelOpen, 0);
@@ -3056,18 +2861,10 @@ int Epd3Base::Epd3U::SetChirp(float Sensitivity)
 			},
 			[&](auto token) {
 				return EndWriteChirpSensitivity(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
-		//SetFunctionReturnValue(eFunctions::WriteChirpSensitivity, 0);
-		//token = BeginWriteChirpSensitivity(epdComsHandle, Sensitivity, nullptr);
-		//r = CommitAndEnd2RV(EndWriteChirpSensitivity, token,100);
-		//if (r) {
-		//	r = ReConnect();
-		//	SetFunctionReturnValue(eFunctions::WriteChirpSensitivity, 1);
-		//	token = BeginWriteChirpSensitivity(epdComsHandle, Sensitivity, nullptr);
-		//	r = CommitAndEnd2RV(EndWriteChirpSensitivity, token,100);
-		//}
+	
 	}
 	if (r) goto error;
 
@@ -3078,18 +2875,10 @@ int Epd3Base::Epd3U::SetChirp(float Sensitivity)
 			},
 			[&](auto token) {
 				return EndWriteChirpEnable_R3(epdComsHandle, token);
-			}, 100
+			}, 10
 		);
 
-		//SetFunctionReturnValue(eFunctions::WriteChirpEnable_R3, 0);
-		//token = BeginWriteChirpEnable_R3(epdComsHandle, enable, nullptr);
-		//r = CommitAndEnd2RV(EndWriteChirpEnable_R3, token,100);
-		//if (r) {
-		//	r = ReConnect();
-		//	SetFunctionReturnValue(eFunctions::WriteChirpEnable_R3, 0);
-		//	token = BeginWriteChirpEnable_R3(epdComsHandle, enable, nullptr);
-		//	r = CommitAndEnd2RV(EndWriteChirpEnable_R3, token,100);
-		//}
+	
 	}
 	if (r) goto error;
 
@@ -3107,7 +2896,7 @@ int Epd3Base::Epd3U::GetSelfTestData()
 		},
 		[&](auto token) {
 			return  EndReadSelfTestInterval(epdComsHandle, token, &SelfTestMinutes);
-		}, 100
+		}, 10
 	);
 
 	//SetFunctionReturnValue(eFunctions::fReadSelfTestInterval, 0);
@@ -3134,22 +2923,7 @@ int Epd3Base::Epd3U::DoSelfTest()
 	SetFunctionReturnValue(eFunctions::fDoSelfTest, 0);
 	if (epdComsHandle) {
 		r = SetEpdON();
-		//r = RunComsTransaction(eFunctions::EpdOn, 0,
-		//	[&]() {
-		//		return  BeginEpdOnOff(epdComsHandle, 1, nullptr);
-		//	},
-		//	[&](auto token) {
-		//		return  EndEpdOnOff(epdComsHandle, token);
-		//	}, 100
-		//);
-
-		//SetFunctionReturnValue(eFunctions::EpdOn, 0);
-		//token = BeginEpdOnOff(epdComsHandle, 1, nullptr);
-		//r = CommitAndSetRV();
-		//if (!r)
-		//r = EndEpdOnOff(epdComsHandle, token);
-		//SetEndReturnValue(r);
-
+		
 		r = RunComsTransaction(eFunctions::fDoSelfTest, 0,
 			[&]() {
 				return  BeginStartDetectorTest(epdComsHandle, nullptr);
@@ -3159,17 +2933,7 @@ int Epd3Base::Epd3U::DoSelfTest()
 			}, 5000
 		);
 
-		//SetFunctionReturnValue(eFunctions::fDoSelfTest, 0);
-		//token = BeginStartDetectorTest(epdComsHandle, nullptr);
-		//r = CommitAndSetRV();
-		//if (!r)
-		//{
-		//	Sleep(5000);
-		//	r = EndStartDetectorTest(epdComsHandle, token);
-		//}
-		//else
-		//	DebugWrite("****    StartDetectorTest rv={} ****\n", r);
-		//r = SetEndReturnValue(r);
+	
 
 
 		if (r) current->StatusDecoded = false;
@@ -3179,16 +2943,7 @@ int Epd3Base::Epd3U::DoSelfTest()
 		r= SetEpdOFF();
 
 
-		//SetFunctionReturnValue(eFunctions::EpdOff, 0);
-		//token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
-		//r = CommitAndSetRV();
-		//if (!r) {
-		//	Sleep(1000);
-		//	r = EndEpdOnOff(epdComsHandle, token);
-		//}
-		//else
-		//	DebugWrite("****    EpdOff rv={} ****\n", r);
-		//SetEndReturnValue(r);
+	
 
 	
 		if (StopInterface) {
diff --git a/EpdBase3/Epd3Base.h b/EpdBase3/Epd3Base.h
index aa45b3d..1c756d7 100644
--- a/EpdBase3/Epd3Base.h
+++ b/EpdBase3/Epd3Base.h
@@ -130,6 +130,7 @@ namespace Epd3Base {
 		int16_t errorm009 = 0; //error -9 r_OperationTimeout
 		int16_t errorm007 = 0; //error -7 r_InvalidState
 		int16_t errorm102 = 0; //error -102 r_InsufficientPriv
+		int16_t errorm200 = 0; //error -200 r_ErrorUnexpectedResponse
 		int16_t errorm202 = 0; //error -202 r_ErrorNotConnected
 		int16_t error_other = 0; //other errors
 		int CurrentStep;
@@ -467,9 +468,10 @@ namespace Epd3Base {
 		void resetErrors();
 		void incrementError(int rv);
 		void ResetStepReturnValues();
-		bool RunComsTransaction(enum eFunctions f, BYTE CanIgnor, auto beginCall, auto endCall, int waitTime=10) {
+		template <typename FBegin, typename FEnd>
+		bool RunComsTransaction(enum eFunctions f, BYTE CanIgnor, FBegin beginCall, FEnd endCall, int waitTime=10) {
 			int r = 0, trie = 0;
-			SetFunctionReturnValue(f, CanIgnor, 0);
+			SetFunctionReturnValue(f, CanIgnor, trie);
 			auto token = beginCall();
 			r = Commit3(epdComsHandle);
 			SetCommitReturnValue(r);
@@ -482,6 +484,7 @@ namespace Epd3Base {
 				trie++;
 				ReConnect();
 				SetFunctionReturnValue(f, CanIgnor,  trie);
+				token = beginCall();
 				r = Commit3(epdComsHandle);
 				SetCommitReturnValue(r);
 				if (!r) {
@@ -530,10 +533,10 @@ namespace Epd3Base {
 			if (logFile.is_open()) {
 				std::string msg = std::format(fmt, std::forward<Args>(args)...);
 				logFile << msg << "\n";
-				logFile.flush(); // Zorg dat het direct naar schijf wordt geschreven
+				logFile.flush(); 
 			}
 
-			// Optioneel ook naar Visual Studio Output window sturen:
+			// Optioneel ook naar Visual Studio Output
 			std::string debugMsg = std::format(fmt, std::forward<Args>(args)...) + "\n";
 			OutputDebugStringA(debugMsg.c_str());
 		}
diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp
index 74a6d0a..82652cc 100644
--- a/EpdBaseClr/EpdBaseClr.cpp
+++ b/EpdBaseClr/EpdBaseClr.cpp
@@ -162,11 +162,12 @@ int EpdBaseClr::Epd2::GetSteps()
 }
 int EpdBaseClr::Epd2::GetErrors()
 {
-	if (epd3->errorm009 > 0 || epd3->errorm007 > 0 || epd3->errorm102 > 0 || epd3->errorm202 > 0 || epd3->error_other > 0) {
+	if (epd3->errorm009 > 0 || epd3->errorm007 > 0 || epd3->errorm102 > 0 || epd3->errorm200 > 0 || epd3->errorm202 > 0 || epd3->error_other > 0) {
 		ErrorReturnValues = gcnew System::Collections::Generic::Dictionary<int, int>(5);
 		ErrorReturnValues->Add(-9, epd3->errorm009);
 		ErrorReturnValues->Add(-7, epd3->errorm007);
 		ErrorReturnValues->Add(-102, epd3->errorm102);
+		ErrorReturnValues->Add(-200, epd3->errorm200);
 		ErrorReturnValues->Add(-202, epd3->errorm202);
 		ErrorReturnValues->Add(-999, epd3->error_other);
 	}
@@ -411,6 +412,7 @@ int EpdBaseClr::Epd2::AfterGetStatus(EpdBase::Epd2U *epd)
 	int VersionMinor = 5;
 
 	// Formats as "1.5"
+	HardwareVersion = String::Format("{0}.{0}", HardVersion, HardVersionMinor);
 	FirmwareVersion = String::Format("{0}", epd->SoftVersion);
 	FunctionFlags = epd->FunctionFlags;
 	CountsClock = epd->EpdClock;
@@ -444,6 +446,7 @@ int EpdBaseClr::Epd2::AfterGetStatus(Epd3Base::Epd3U* epd)
 	FunctionFlags = epd->FunctionFlags;
 	CountsClock = epd->EpdClock;
 	//hier nodig ?
+	HardwareVersion = String::Format("{0}.{1}", epd->HardVersion, epd->HardVersionMinor);
 	FirmwareVersion = String::Format("{0}.{1}.{2}.{3}", epd->SoftVersion, epd->SoftVersionMinor,epd->SoftVersionPatch,epd->SoftVersionBuild);
 	DecodeStatus( epd); // zet hasAlarm
 	return 0;
@@ -1300,6 +1303,7 @@ int  EpdBaseClr::Epd2::DoSelfTest() {
 		EPDDetectorTestRequested = epd3->EPDDetectorTestRequested;
 		EPDDetectorTestPassed = epd3->EPDDetectorTestPassed;
 		EpdID = epd3->Epd.Id;
+		HardwareVersion = String::Format("{0}.{1}", epd3->HardVersion, epd3->HardVersionMinor);
 		FirmwareVersion = String::Format("{0}.{1}.{2}.{3}", epd3->SoftVersion, epd3->SoftVersionMinor, epd3->SoftVersionPatch, epd3->SoftVersionBuild);
 		return rv;
 	}
diff --git a/EpdBaseClr/EpdBaseClr.h b/EpdBaseClr/EpdBaseClr.h
index 71e38b4..74ca64a 100644
--- a/EpdBaseClr/EpdBaseClr.h
+++ b/EpdBaseClr/EpdBaseClr.h
@@ -301,6 +301,7 @@ namespace EpdBaseClr {
 		int HardVersion, HardVersionMinor;
 		int SoftVersion ;
 		String^ FirmwareVersion;
+		String^ HardwareVersion;
 		int FunctionFlags ;
 
 		unsigned short BatADC;
diff --git a/EpdBaseClr/Version.h b/EpdBaseClr/Version.h
index d573667..77d5fc2 100644
--- a/EpdBaseClr/Version.h
+++ b/EpdBaseClr/Version.h
@@ -2,12 +2,12 @@
 
 // C++ / Win32 resource editor vereist getallen met komma's
 #define VERSION_MAJOR               4
-#define VERSION_MINOR               2
+#define VERSION_MINOR               3
 #define VERSION_BUILD               0
 #define VERSION_REVISION            0
 
 // Strings voor de tekstuele weergave
-#define VERSION_STRING              "4.2.0.0"
+#define VERSION_STRING              "4.3.0.0"
 #define COPYRIGHT_STRING            "Copyright (c) 2019-2026 LSW-Tech Luc Vandenbroucke"
 #define COMPANY_STRING              "LSW-Tech"
 #define PRODUCT_STRING              "EpdBaseClr"
diff --git a/SyncToSqlsrv7.ps1 b/SyncToSqlsrv7.ps1
index dc026eb..1568925 100644
--- a/SyncToSqlsrv7.ps1
+++ b/SyncToSqlsrv7.ps1
@@ -53,11 +53,8 @@ return [PSCustomObject]@{
 Set-Content -Path "$DestPath\Get-EdosZipNames.ps1" -Value $ScriptContent
 Set-AuthenticodeSignature -FilePath "$DestPath\Get-EdosZipNames.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com" | Select-Object Path, StatusMessage
 
-Set-Content -Path "$DestPath\GetEdosStationZip.ps1" -Value "return [string]""$zip"""
-Set-AuthenticodeSignature -FilePath "$DestPath\GetEdosStationZip.ps1"  -Certificate $cert -TimestampServer "http://timestamp.digicert.com" | Select-Object Path, StatusMessage
-
-Set-Content -Path "$DestPath\GetsyncEdosLocalZip.ps1" -Value "return [string]""$zips"""
-Set-AuthenticodeSignature -FilePath "$DestPath\GetsyncEdosLocalZip.ps1"  -Certificate $cert -TimestampServer "http://timestamp.digicert.com" | Select-Object Path, StatusMessage
+#Set-Content -Path "$DestPath\GetEdosStationZip.ps1" -Value "return [string]""$zip"""
+#Set-AuthenticodeSignature -FilePath "$DestPath\GetEdosStationZip.ps1"  -Certificate $cert -TimestampServer "http://timestamp.digicert.com" | Select-Object Path, StatusMessage
 
 
 Copy-Item -Path "$ScriptPath\*.cmd" -Destination "$DestPath"
diff --git a/eDosLocal/SqlUpdates/update_005.sql b/eDosLocal/SqlUpdates/update_005.sql
new file mode 100644
index 0000000..1df15cf
--- /dev/null
+++ b/eDosLocal/SqlUpdates/update_005.sql
@@ -0,0 +1,80 @@
+DECLARE @TargetVersionNumber INT=4, @VersionNumber INT;
+IF OBJECT_ID('dbo.[DatabaseVersion]') IS NULL BEGIN
+    CREATE TABLE [dbo].[DatabaseVersion] ([VersionNumber] INT NOT NULL,
+    [VersionDate] DATETIME NOT NULL,
+    [Description] NVARCHAR(200) NULL);
+    INSERT INTO [dbo].[DatabaseVersion]([VersionNumber], [VersionDate], [Description])
+    VALUES(1, GETDATE(), 'Initial version');
+    SET @VersionNumber=1;
+END;
+ELSE BEGIN
+    SELECT @VersionNumber=ISNULL(MAX([VersionNumber]), 0)
+    FROM [dbo].[DatabaseVersion];
+END;
+
+-- If version target is not met, disable execution for all subsequent batches
+IF @VersionNumber<>@TargetVersionNumber BEGIN
+    PRINT 'Target version condition not met (Version is not '+CAST(@TargetVersionNumber AS VARCHAR(10))+'). Canceling rest of script.';
+    SET NOEXEC ON;
+END;
+GO
+IF NOT EXISTS (SELECT 1
+               FROM [sys].[columns]
+               WHERE [object_id]=OBJECT_ID('[dbo].[EPDDevice]')AND [name]='HardWare')
+    ALTER TABLE [dbo].[EPDDevice] ADD [HardWare] VARCHAR(50);
+GO
+IF NOT EXISTS (SELECT 1
+               FROM [sys].[columns]
+               WHERE [object_id]=OBJECT_ID('[dbo].[EPDDeviceLog]')AND [name]='DllVersion')
+    ALTER TABLE [dbo].[EPDDeviceLog] ADD [DllVersion] VARCHAR(50);
+GO
+UPDATE [dbo].[EPDDevice] SET [synced]=0 WHERE [synced] IS NULL;
+GO
+CREATE OR ALTER PROCEDURE [dbo].[EPDAddLog] @EPDID INT, @FirmWare VARCHAR(50), @BatNoload_mV INT=0, @Batload_mV INT=0, @CPU_mV INT=0, @ID_Station INT, @ID_Visit INT, @epdType TINYINT, @r_InvalidState INT=0, @r_OperationTimeout INT=0, @r_InsufficientPriv INT=0, @r_OperationFailed INT=0, @r_OtherError INT=0, @WriteTime INT=0, @Registered BIT=0, @HardWare VARCHAR(50)=null, @DllVersion VARCHAR(50)=null
+AS BEGIN
+    DECLARE @now DATETIME=GETDATE();
+    IF NOT EXISTS (SELECT * FROM [dbo].[EPDDevice] WHERE [EPDID]=@EPDID)
+        INSERT [dbo].[EPDDevice]([EPDID], [FirmWare], [First_Station], [firstseen], [Last_Station], [lastseen], [epdType], [synced], [HardWare])
+        VALUES(@EPDID, @FirmWare, @ID_Station, @now, @ID_Station, @now, @epdType, 0, @HardWare);
+    ELSE
+        UPDATE [dbo].[EPDDevice]
+        SET [Last_Station]=@ID_Station, [lastseen]=@now, [synced]=0, [HardWare]=@HardWare
+        WHERE [EPDID]=@EPDID;
+
+    INSERT [dbo].[EPDDeviceLog]([EPDID], [ID_Station], [ID_Visit], [updated], [BatNoload_mV], [Batload_mV], [CPU_mV], [r_InvalidState], [r_OperationTimeout], [r_InsufficientPriv], [r_OperationFailed], [r_OtherError], [WriteTime], [Registered] , [DllVersion])
+    VALUES(@EPDID, -- EPDID - int
+    @ID_Station, -- ID_Station - int
+    @ID_Visit, -- ID_Visit - int
+    @now, -- updated - datetime
+    @BatNoload_mV, @Batload_mV, @CPU_mV, @r_InvalidState, @r_OperationTimeout, @r_InsufficientPriv, @r_OperationFailed, @r_OtherError, @WriteTime, @Registered, @DllVersion);
+END;
+GO
+CREATE OR ALTER PROCEDURE [EPDDeviceToSync]
+AS
+SELECT [EPDID], [FirmWare], [First_Station], [firstseen], [Last_Station]=ISNULL([Last_Station], [First_Station]), [lastseen]=ISNULL([lastseen], [firstseen]), [epdType]=ISNULL([epdType], 0), [synced]=ISNULL([synced], 0), [HardWare]
+FROM [dbo].[EPDDevice]
+WHERE([synced]=0 OR [synced] IS NULL);
+GO
+GRANT EXECUTE ON [EPDDeviceToSync] TO [eDosStation];
+GO
+CREATE OR ALTER PROCEDURE [EPDDeviceSetSynced] @EPDID INT
+AS
+UPDATE [dbo].[EPDDevice] SET [synced]=1 WHERE [EPDID]=@EPDID;
+GO
+GRANT EXECUTE ON [EPDDeviceSetSynced] TO [eDosStation];
+GO
+CREATE OR ALTER PROCEDURE [EPDDeviceLogToSync] @ID_STATION INT, @MaxVisit INT
+AS
+SELECT [EPDID], [ID_Station], [ID_Visit], [updated], [BatNoload_mV], [Batload_mV], [CPU_mV], [r_InvalidState], [r_OperationTimeout], [r_InsufficientPriv], [r_OperationFailed], [r_OtherError], [Registered], [WriteTime], [DllVersion]
+FROM [dbo].[EPDDeviceLog]
+WHERE([ID_Station]=@ID_STATION)AND([ID_Visit]>@MaxVisit)
+ORDER BY [ID_Visit];
+GO
+GRANT EXECUTE ON [EPDDeviceLogToSync] TO [eDosStation];
+GO
+INSERT INTO [dbo].[DatabaseVersion]([VersionNumber], [VersionDate], [Description])
+VALUES(5, GETDATE(), 'Device sync');
+GO
+-- Final Batch: Turn execution back ON for subsequent scripts in the same session
+SET NOEXEC OFF;
+GO
\ No newline at end of file
diff --git a/eDosLocal/SqlUpdates/update_006.sql b/eDosLocal/SqlUpdates/update_006.sql
new file mode 100644
index 0000000..9909169
--- /dev/null
+++ b/eDosLocal/SqlUpdates/update_006.sql
@@ -0,0 +1,218 @@
+DECLARE @TargetVersionNumber INT=5, @VersionNumber INT;
+IF OBJECT_ID('dbo.[DatabaseVersion]') IS NULL BEGIN
+    CREATE TABLE [dbo].[DatabaseVersion] ([VersionNumber] INT NOT NULL,
+    [VersionDate] DATETIME NOT NULL,
+    [Description] NVARCHAR(200) NULL);
+    INSERT INTO [dbo].[DatabaseVersion]([VersionNumber], [VersionDate], [Description])
+    VALUES(1, GETDATE(), 'Initial version');
+    SET @VersionNumber=1;
+END;
+ELSE BEGIN
+    SELECT @VersionNumber=ISNULL(MAX([VersionNumber]), 0)
+    FROM [dbo].[DatabaseVersion];
+END;
+
+-- If version target is not met, disable execution for all subsequent batches
+IF @VersionNumber<>@TargetVersionNumber BEGIN
+    PRINT 'Target version condition not met (Version is not '+CAST(@TargetVersionNumber AS VARCHAR(10))+'). Canceling rest of script.';
+    SET NOEXEC ON;
+END;
+GO
+
+IF NOT EXISTS (SELECT 1
+               FROM [sys].[columns]
+               WHERE [object_id]=OBJECT_ID('[dbo].[EPDDeviceLog]')AND [name]='r_ErrorUnexpectedResponse')
+    ALTER TABLE [dbo].[EPDDeviceLog] ADD [r_ErrorUnexpectedResponse] int;
+GO
+
+CREATE OR ALTER PROCEDURE [dbo].[EPDAddLog] @EPDID INT, @FirmWare VARCHAR(50), @BatNoload_mV INT=0, @Batload_mV INT=0, @CPU_mV INT=0, @ID_Station INT, @ID_Visit INT, @epdType TINYINT, @r_InvalidState INT=0, @r_OperationTimeout INT=0, @r_InsufficientPriv INT=0, @r_OperationFailed INT=0, @r_ErrorUnexpectedResponse INT=0,  @r_OtherError INT=0, @WriteTime INT=0, @Registered BIT=0, @HardWare VARCHAR(50)=null, @DllVersion VARCHAR(50)=null
+AS BEGIN
+    DECLARE @now DATETIME=GETDATE();
+    IF NOT EXISTS (SELECT * FROM [dbo].[EPDDevice] WHERE [EPDID]=@EPDID)
+        INSERT [dbo].[EPDDevice]([EPDID], [FirmWare], [First_Station], [firstseen], [Last_Station], [lastseen], [epdType], [synced], [HardWare])
+        VALUES(@EPDID, @FirmWare, @ID_Station, @now, @ID_Station, @now, @epdType, 0, @HardWare);
+    ELSE
+        UPDATE [dbo].[EPDDevice]
+        SET [Last_Station]=@ID_Station, [lastseen]=@now, [synced]=0, [HardWare]=@HardWare
+        WHERE [EPDID]=@EPDID;
+
+    INSERT [dbo].[EPDDeviceLog]([EPDID], [ID_Station], [ID_Visit], [updated], [BatNoload_mV], [Batload_mV], [CPU_mV], [r_InvalidState], [r_OperationTimeout], [r_InsufficientPriv], [r_OperationFailed], [r_ErrorUnexpectedResponse],  [r_OtherError], [WriteTime], [Registered] , [DllVersion])
+    VALUES(@EPDID, -- EPDID - int
+    @ID_Station, -- ID_Station - int
+    @ID_Visit, -- ID_Visit - int
+    @now, -- updated - datetime
+    @BatNoload_mV, @Batload_mV, @CPU_mV, @r_InvalidState, @r_OperationTimeout, @r_InsufficientPriv, @r_OperationFailed, @r_ErrorUnexpectedResponse, @r_OtherError, @WriteTime, @Registered, @DllVersion);
+END;
+GO
+CREATE OR ALTER PROCEDURE [EPDDeviceLogToSync] @ID_STATION INT, @MaxVisit INT
+AS
+SELECT [EPDID], [ID_Station], [ID_Visit], [updated], [BatNoload_mV], [Batload_mV], [CPU_mV], [r_InvalidState], [r_OperationTimeout], [r_InsufficientPriv], [r_OperationFailed],[r_ErrorUnexpectedResponse]=ISNULL([r_ErrorUnexpectedResponse],0), [r_OtherError], [Registered], [WriteTime], [DllVersion]=ISNULL([DllVersion],'')
+FROM [dbo].[EPDDeviceLog]
+WHERE([ID_Station]=@ID_STATION)AND([ID_Visit]>@MaxVisit)
+ORDER BY [ID_Visit];
+GO
+ALTER   PROCEDURE [dbo].[StationSettingsSelect]
+AS
+BEGIN
+    SELECT [ID_Station],
+           [PCNr],
+           [ComPort],
+           [Inst_CODE1],
+           [Inst_CODE2],
+           [Inst_Name1],
+           [Inst_Name2],
+           [TestCSN],
+           [Reader],
+           ISNULL([useTestButtons], 0) AS [useTestButtons],
+           ISNULL([useBeep], 22) AS [useBeep],
+           ISNULL([checkUser], 0) AS [checkUser],
+           ISNULL([EPDTimeout], 10000) AS [EPDTimeout],
+           ISNULL([EPDREtries], 1) AS [EPDRetries],
+           ISNULL([RestartCom], 0) AS [RestartCom],
+           ISNULL([RestartComFirst], 0) AS [RestartComFirst],
+           ISNULL([OnlyMK2], 0) AS [OnlyMK2],
+           ISNULL([AllowMultipleEPD], 0) AS [AllowMultipleEPD],
+           ISNULL([WriteConfig], 0) AS [WriteConfig],
+           ISNULL([IssueWhenDoseAlarms], 0) AS [IssueWhenDoseAlarms],
+           [ElatecPort],
+           [SleepAfterClear] = ISNULL([SleepAfterClear], 6000),
+           [ResponseTimeout] = ISNULL([ResponseTimeout], 500),
+           [DiscoveryCacheTimeout] = ISNULL([DiscoveryCacheTimeout], 5000),
+           [ReconnectRetries] = ISNULL([ReconnectRetries], 5),
+           [SleepBeforeReconnect] = ISNULL([SleepBeforeReconnect], 1000),
+           [SleepAfterDisconnect] = ISNULL([SleepAfterDisconnect], 1000),
+           [DoDisconnectAfterClear] = ISNULL([DoDisconnectAfterClear], 0),
+           [DoDisconnectBeforeReconnect] = ISNULL([DoDisconnectBeforeReconnect], 0),
+           [ProtectedSession] = ISNULL([ProtectedSession], 0),
+           [UserProfile] = ISNULL([UserProfile], 0)
+    FROM [dbo].[StationSettings]
+    WHERE [PCNr] = HOST_NAME();
+END;
+GO
+USE [eDosLocal]
+GO
+/****** Object:  StoredProcedure [dbo].[StationSettingsUpdate]    Script Date: 22/10/2026 12:48:24 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER OFF
+GO
+ALTER   PROCEDURE [dbo].[StationSettingsUpdate]
+    @ComPort INT = NULL,
+    @Inst_CODE1 INT = NULL,
+    @Inst_CODE2 INT = NULL,
+    @Inst_Name1 VARCHAR(50) = NULL,
+    @Inst_Name2 VARCHAR(50) = NULL,
+    @TestCSN VARCHAR(50) = NULL,
+    @Reader VARCHAR(70) = NULL,
+    @useTestButtons BIT = 0,
+    @useBeep TINYINT = 22,
+    @checkUser BIT = 0,
+    @EPDTimeout INT = 10000,
+    @EPDRetries INT = 1,
+    @RestartCom BIT = 0,
+    @RestartComFirst BIT = 0,
+    @OnlyMK2 BIT = 0,
+    @AllowMultipleEPD BIT = 0,
+    @WriteConfig BIT = 1,
+    @IssueWhenDoseAlarms BIT = 0,
+    @ElatecPort INT = NULL,
+    @SleepAfterClear INT = 6000,
+    @ResponseTimeout INT=500,
+    @DiscoveryCacheTimeout INT=5000,
+    @ReconnectRetries INT=5,
+    @SleepBeforeReconnect INT=1000,
+    @SleepAfterDisconnect INT=1000,
+    @DoDisconnectAfterClear BIT=0,
+    @DoDisconnectBeforeReconnect BIT=0,
+    @ProtectedSession bit=0,
+    @UserProfile BIT=0
+AS
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM [dbo].[StationSettings] WHERE [PCNr] = HOST_NAME())
+    BEGIN
+        INSERT [dbo].[StationSettings]
+        (
+            [PCNr],
+            [ComPort],
+            [Inst_CODE1],
+            [Inst_CODE2],
+            [Inst_Name1],
+            [Inst_Name2],
+            [TestCSN],
+            [Reader],
+            [useTestButtons],
+            [useBeep],
+            [checkUser],
+            [EPDREtries],
+            [RestartCom],
+            [RestartComFirst],
+            [OnlyMK2],
+            [AllowMultipleEPD],
+            [WriteConfig],
+            [IssueWhenDoseAlarms],
+            [ElatecPort],
+            [SleepAfterClear],
+            [ResponseTimeout],
+            [DiscoveryCacheTimeout],
+            [ReconnectRetries],
+            [SleepBeforeReconnect],
+            [SleepAfterDisconnect],
+            [DoDisconnectAfterClear],
+            [DoDisconnectBeforeReconnect],[protectedSession],[userProfile]
+        )
+        VALUES
+        (HOST_NAME(), @ComPort, @Inst_CODE1, @Inst_CODE2, @Inst_Name1, @Inst_Name2, @TestCSN, @Reader, @useTestButtons,
+         @useBeep, @checkUser, @EPDRetries, @RestartCom, @RestartComFirst, @OnlyMK2, @AllowMultipleEPD, @WriteConfig,
+         @IssueWhenDoseAlarms, @ElatecPort, @SleepAfterClear, @ResponseTimeout ,
+    @DiscoveryCacheTimeout ,
+    @ReconnectRetries ,
+    @SleepBeforeReconnect,
+    @SleepAfterDisconnect,
+    @DoDisconnectAfterClear,
+    @DoDisconnectBeforeReconnect,
+    @ProtectedSession,
+    @UserProfile);
+    END
+    ELSE
+    BEGIN
+        UPDATE [dbo].[StationSettings]
+        SET [ComPort] = @ComPort,
+            [Inst_CODE1] = @Inst_CODE1,
+            [Inst_CODE2] = @Inst_CODE2,
+            [Inst_Name1] = @Inst_Name1,
+            [Inst_Name2] = @Inst_Name2,
+            [TestCSN] = @TestCSN,
+            [Reader] = @Reader,
+            [useTestButtons] = @useTestButtons,
+            [useBeep] = @useBeep,
+            [checkUser] = @checkUser,
+            [EPDTimeout] = @EPDTimeout,
+            [EPDREtries] = @EPDRetries,
+            [RestartCom] = @RestartCom,
+            [RestartComFirst] = @RestartComFirst,
+            [OnlyMK2] = @OnlyMK2,
+            [AllowMultipleEPD] = @AllowMultipleEPD,
+            [WriteConfig] = @WriteConfig,
+            [IssueWhenDoseAlarms] = @IssueWhenDoseAlarms,
+            [ElatecPort] = @ElatecPort,
+            [SleepAfterClear] = @SleepAfterClear,
+            [ResponseTimeout] = @ResponseTimeout,
+            [DiscoveryCacheTimeout] = @DiscoveryCacheTimeout,
+            [ReconnectRetries] = @ReconnectRetries,
+            [SleepBeforeReconnect] = @SleepBeforeReconnect,
+            [SleepAfterDisconnect] = @SleepAfterDisconnect,
+            [DoDisconnectAfterClear] = @DoDisconnectAfterClear,
+            [DoDisconnectBeforeReconnect] = @DoDisconnectBeforeReconnect,
+            [ProtectedSession] = @ProtectedSession,
+            [UserProfile] = @UserProfile
+        WHERE [PCNr] = HOST_NAME();
+    END
+END
+
+go
+INSERT INTO [dbo].[DatabaseVersion]([VersionNumber], [VersionDate], [Description])
+VALUES(6, GETDATE(), 'r_ErrorUnexpectedResponse');
+GO
+-- Final Batch: Turn execution back ON for subsequent scripts in the same session
+SET NOEXEC OFF;
+GO
\ No newline at end of file
diff --git a/eDosLocal/eDosLocal.sqlproj b/eDosLocal/eDosLocal.sqlproj
index 229f7a5..936295d 100644
--- a/eDosLocal/eDosLocal.sqlproj
+++ b/eDosLocal/eDosLocal.sqlproj
@@ -78,4 +78,14 @@
       <CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="SqlUpdates\update_005.sql">
+      <CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="SqlUpdates\update_006.sql">
+      <CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eDosStation/DataInterface.cs b/eDosStation/DataInterface.cs
index d87eb6a..e227e9a 100644
--- a/eDosStation/DataInterface.cs
+++ b/eDosStation/DataInterface.cs
@@ -90,9 +90,9 @@ namespace eDosStation
             ID_Station = curIDStation;
             LastIDCommand.Parameters["ID_Station"].Value = curIDStation;
             VisitInitCommand.Parameters["ID_Station"].Value = curIDStation;
-            EPDLogCommand.Parameters["ID_Station"].Value = curIDStation;
             CheckStatus.Parameters["ID_Station"].Value = curIDStation;
             VisitInitConfirmCommand.Parameters["ID_Station"].Value = curIDStation;
+            EPDLogCommand.SetIntParam("ID_Station",curIDStation);
         }
         public bool isOnline()
         {
@@ -294,23 +294,26 @@ namespace eDosStation
             SqlCommandBuilder.DeriveParameters(GetPersonInfo);
 
             EPDLogCommand = new System.Data.SqlClient.SqlCommand("[dbo].[EPDAddLog]", localConnection) { CommandType = System.Data.CommandType.StoredProcedure };
-            EPDLogCommand.Parameters.AddRange(new System.Data.SqlClient.SqlParameter[] {
-                  new System.Data.SqlClient.SqlParameter("EPDID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("FirmWare",SqlDbType.VarChar,50,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("BatNoload_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("Batload_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("CPU_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("ID_Station",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("ID_Visit",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("epdType",SqlDbType.TinyInt,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("r_InvalidState",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("r_OperationTimeout",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("r_InsufficientPriv",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("r_OperationFailed",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("r_OtherError",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("WriteTime",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                , new System.Data.SqlClient.SqlParameter("Registered",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
-                });
+            SqlCommandBuilder.DeriveParameters(EPDLogCommand);
+            //EPDLogCommand.Parameters.AddRange(new System.Data.SqlClient.SqlParameter[] {
+            //      new System.Data.SqlClient.SqlParameter("EPDID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("FirmWare",SqlDbType.VarChar,50,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("BatNoload_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("Batload_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("CPU_mV",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("ID_Station",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("ID_Visit",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("epdType",SqlDbType.TinyInt,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("r_InvalidState",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("r_OperationTimeout",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("r_InsufficientPriv",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("r_OperationFailed",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("r_OtherError",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("WriteTime",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("Registered",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("HardWare",SqlDbType.VarChar,50,System.Data.ParameterDirection.Input,true,0,0,null,System.Data.DataRowVersion.Default,null)
+            //    , new System.Data.SqlClient.SqlParameter("DllVersion",SqlDbType.VarChar,50,System.Data.ParameterDirection.Input,true,0,0,null,System.Data.DataRowVersion.Default,null)
+            //  });
             if (oldState == ConnectionState.Closed) localConnection.Close();
         }
 
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 88bbcbb..ca84b96 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -433,9 +433,9 @@ namespace eDosStation
                         ep.GetExtraEPDData();
                         //co = dataInterface.getCon(true);
                         dataInterface.EPDLogCommand.Connection = co;
-                        dataInterface.EPDLogCommand.Parameters["ID_Station"].Value = thisStation.ID_Station;
-                        dataInterface.EPDLogCommand.Parameters["ID_Visit"].Value = ID_Visit;
-                        dataInterface.EPDLogCommand.Parameters["EPDID"].Value = ep.EpdID;
+                        dataInterface.EPDLogCommand.SetIntParam("ID_Station",thisStation.ID_Station);
+                        dataInterface.EPDLogCommand.SetIntParam("ID_Visit",ID_Visit);
+                        dataInterface.EPDLogCommand.SetIntParam("EPDID",(int)ep.EpdID);
 
                         dataInterface.EPDLogCommand.SetStringParam("FirmWare", ep.FirmwareVersion);
                         dataInterface.EPDLogCommand.SetIntParam("BatNoload_mV", ep.BatNoLoad_mV);
@@ -445,6 +445,7 @@ namespace eDosStation
                         dataInterface.EPDLogCommand.SetIntParam("r_OperationTimeout", 0);
                         dataInterface.EPDLogCommand.SetIntParam("r_InsufficientPriv", 0);
                         dataInterface.EPDLogCommand.SetIntParam("r_OperationFailed", 0);
+                        dataInterface.EPDLogCommand.SetIntParam("r_ErrorUnexpectedResponse", 0);
                         dataInterface.EPDLogCommand.SetIntParam("r_OtherError", 0)  ;
                         dataInterface.EPDLogCommand.SetIntParam("epdType", ep.epdType)  ;
                         dataInterface.EPDLogCommand.SetBoolParam("Registered",Registered);
@@ -453,12 +454,16 @@ namespace eDosStation
 
                         if (ep.ErrorReturnValues != null)
                         {
-                            if (ep.ErrorReturnValues.ContainsKey(-7)) dataInterface.EPDLogCommand.Parameters["r_InvalidState"].Value = ep.ErrorReturnValues[-7];
-                            if (ep.ErrorReturnValues.ContainsKey(-9)) dataInterface.EPDLogCommand.Parameters["r_OperationTimeout"].Value = ep.ErrorReturnValues[-9];
-                            if (ep.ErrorReturnValues.ContainsKey(-102)) dataInterface.EPDLogCommand.Parameters["r_InsufficientPriv"].Value = ep.ErrorReturnValues[-102];
-                            if (ep.ErrorReturnValues.ContainsKey(-202)) dataInterface.EPDLogCommand.Parameters["r_OperationFailed"].Value = ep.ErrorReturnValues[-202];
-                            if (ep.ErrorReturnValues.ContainsKey(-999)) dataInterface.EPDLogCommand.Parameters["r_OtherError"].Value = ep.ErrorReturnValues[-999];
+                            if (ep.ErrorReturnValues.ContainsKey(-7)) dataInterface.EPDLogCommand.SetIntParam("r_InvalidState",ep.ErrorReturnValues[-7]);
+                            if (ep.ErrorReturnValues.ContainsKey(-9)) dataInterface.EPDLogCommand.SetIntParam("r_OperationTimeout",ep.ErrorReturnValues[-9]);
+                            if (ep.ErrorReturnValues.ContainsKey(-102)) dataInterface.EPDLogCommand.SetIntParam("r_InsufficientPriv",ep.ErrorReturnValues[-102]);
+                            if (ep.ErrorReturnValues.ContainsKey(-202)) dataInterface.EPDLogCommand.SetIntParam("r_OperationFailed",ep.ErrorReturnValues[-202]);
+                            if (ep.ErrorReturnValues.ContainsKey(-200)) dataInterface.EPDLogCommand.SetIntParam("r_ErrorUnexpectedResponse", ep.ErrorReturnValues[-200]);
+                            if (ep.ErrorReturnValues.ContainsKey(-999)) dataInterface.EPDLogCommand.SetIntParam("r_OtherError",ep.ErrorReturnValues[-999]);
+                            //r_ErrorUnexpectedResponse 
                         }
+                        dataInterface.EPDLogCommand.SetStringParam("HardWare", ep.HardwareVersion);
+                        dataInterface.EPDLogCommand.SetStringParam("DllVersion", thisStation.EpdBaseClrVersion);
                         dataInterface.EPDLogCommand.ExecuteNonQuery();
                     }
                     catch (System.Exception ex)
diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs
index d3e9e2c..5a2baae 100644
--- a/eDosStation/MainWindow.xaml.cs
+++ b/eDosStation/MainWindow.xaml.cs
@@ -270,15 +270,18 @@ namespace eDosStation
             bgTimer.Tick += BgTimer_Tick;
             bgTimer.IsEnabled = true;
 
+            string step=string.Empty;
             try
             {
+                step = "datainterface";
                 dataInterface = new DataInterface(curApp.splunkLog);
+                step = "thisStation";
                 thisStation = new Station(dataInterface, string.Empty, curApp, curApp.splunkLog);
                 //dataInterface.splunkLog = thisStation.splunkLog;
             }
             catch (System.Exception ex)
             {
-                curApp.splunkLog?.WriteException(className, "Window_Loaded", ex);
+                curApp.splunkLog?.WriteException(className, "Window_Loaded "+step, ex);
                 errMsg = $"Startup error {ex.Message} ";
                 MessageBox.Show(errMsg);
                 ok = false;
diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs
index 0be2782..4e63eb4 100644
--- a/eDosStation/Properties/AssemblyInfo.cs
+++ b/eDosStation/Properties/AssemblyInfo.cs
@@ -75,5 +75,8 @@ using System.Windows;
 //2026-08-17 3.01 telerik upgrade, cleanup old files
 //2026-08-17 3.03 reconnect,issuewithalarms
 //2026-09-22 4.00  no disconnect, set correct displayids, parameter set for retries, sleep, reconnect
-[assembly: AssemblyVersion("4.1.8.0")]
-[assembly: AssemblyFileVersion("4.1.8.0")]
+//2026-10-16 4.1.9 : testsound only from epd software version 2+
+//2026-10-22 4.1.10-12 : register hardware version,r_ErrorUnexpectedResponse
+
+[assembly: AssemblyVersion("4.1.13.0")]
+[assembly: AssemblyFileVersion("4.1.13.0")]
diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt
index 441b20e..9a6512b 100644
--- a/eDosStation/Resources/BuildDate.txt
+++ b/eDosStation/Resources/BuildDate.txt
@@ -1 +1 @@
-15/10/2026 15:33:58,92 
+22/10/2026 15:59:17,40 
diff --git a/eDosStation/Settings.xaml.cs b/eDosStation/Settings.xaml.cs
index 8048b15..9fd8c45 100644
--- a/eDosStation/Settings.xaml.cs
+++ b/eDosStation/Settings.xaml.cs
@@ -135,7 +135,7 @@ namespace eDosStation
                 thisStation.ResponseTimeout = Convert.ToInt32(numResponseTimeout.Value ?? 0);
                 thisStation.DiscoveryCacheTimeout = Convert.ToInt32(numDiscoveryCacheTimeout.Value ?? 0);
                 thisStation.ReconnectRetries = Convert.ToInt32(numReconnectRetries.Value ?? 0);
-                thisStation.SleepAfterClear = Convert.ToInt32(numSleepAfterClear.Value ?? 0);
+                thisStation.SleepAfterClear = Convert.ToInt32(numSleepAfterClear.Value ?? 2000);
                 thisStation.SleepBeforeReconnect = Convert.ToInt32(numSleepBeforeReconnect.Value ?? 0);
                 thisStation.SleepAfterDisconnect = Convert.ToInt32(numSleepAfterDisconnect.Value ?? 0);
 
diff --git a/eDosStation/Station.cs b/eDosStation/Station.cs
index e5afcc3..272068a 100644
--- a/eDosStation/Station.cs
+++ b/eDosStation/Station.cs
@@ -60,6 +60,8 @@ namespace eDosStation
         public const string defInst_Name1 = "BR1";
         public const string defInst_Name2 = "Venus";
 
+        public Version EpdBaseClrVer;
+        public string EpdBaseClrVersion;
         public cDevCon DevCon;
         public bool Changed = false;
         public int Error = 0;
@@ -79,7 +81,7 @@ namespace eDosStation
         public int ResponseTimeout = 500;
         public int DiscoveryCacheTimeout = 20000; //15000; //ms
         public int ReconnectRetries = 5;
-        public int SleepAfterClear = 5000; //?6000
+        public int SleepAfterClear = 2000; //?6000
         public int SleepBeforeReconnect = 500;
         public int SleepAfterDisconnect = 1000;
         public Boolean DoDisconnectAfterClear = false;
@@ -260,10 +262,18 @@ namespace eDosStation
                     }
                 }
 
-                dataInterface.SetStation(ID_Station);
-                dataInterface.SetCheckUser(checkUser);
-                dataInterface.SetAllowMultipleEPD(AllowMultipleEPD);
-
+                try
+                {
+                    dataInterface.SetStation(ID_Station);
+                    dataInterface.SetCheckUser(checkUser);
+                    dataInterface.SetAllowMultipleEPD(AllowMultipleEPD);
+                } catch (System.Exception ex)
+                {
+                    Error = 1;
+                    ErrorMessage = ex.Message;
+                    splunkLog.WriteException(moduleName, module, ex);
+                    if (stationLog != null) stationLog.WriteLine($"GetStationSettings error {ex.Message} {System.DateTime.Now}");
+                }
                 const string sProc2 = "GetInstallationsComments";
                 if (Error == 0) using (var cmd2 = new SqlCommand(sProc2, co))
                     {
@@ -302,6 +312,12 @@ namespace eDosStation
             }
             DevCon = new cDevCon(ComPort, splunkLog);
             if (isElatec) openElatec();
+
+            EpdBaseClrVer = System.Reflection.Assembly.GetAssembly(typeof(EpdBaseClr.Epd2)).GetName().Version;
+            EpdBaseClrVersion = EpdBaseClrVer.ToString();
+
+
+
         }
         private void CmdSetParams(SqlCommand cmd)
         {
diff --git a/scripts/Downgrader.ps1 b/scripts/Downgrader.ps1
index 6df004f..07e0805 100644
--- a/scripts/Downgrader.ps1
+++ b/scripts/Downgrader.ps1
@@ -208,17 +208,17 @@ exit
 # RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt
 # ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAIT9wzT35FTtvDD4/5
 # khg1MA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMjYxMDE1MTMzNDUzWjAvBgkqhkiG9w0BCQQxIgQgwGts
+# BgkqhkiG9w0BCQUxDxcNMjYxMDIyMTM1OTMwWjAvBgkqhkiG9w0BCQQxIgQgwGts
 # hmgwg+1No3Bfq4IiEmxiCsjb9Jy7A/l9sT7ewm0wDQYJKoZIhvcNAQEBBQAEggIA
-# lGBNbaeSdpmCNhI6gcwqhktn84/CfaSSRZBxdKa5DiZ6hC5BMgT1GMiBVTfIsoLc
-# LYE4hu9sniE86MGzGZRrhyaMej+u6iUuvUG77fncp83mO6N7TkL1l4t3bre1/9aZ
-# U/b2fqe3zWKcOMgkjWkR/kgr1H8p7QLnfuF+mk0a8VG3YwntKYDrAnW2jl9EebBy
-# 8j814DzfXFXwctA9+EQsl1VWfiaiPPB1GWbSrHLlabv6aTghgbOY+ute8KSLSuvA
-# CEzHtw4Ph6IVC9IYJ1T/O50IrVMcN3ttbYKxA6Tdml6oLLdY/ZrM8HiCerxb2A28
-# sdOCjVyL3MYnPLuHCnsracSPLgWczsaK3Y34s7pC9gTi3ycUXNJ6XXYUtr/YwzUb
-# 88J37+8bFT/6QhBHdMLqgWtl1fDRKncssB6Tx5dFb4hIjEM2pBltc7igcAi6BVqR
-# i+xp4PsuIFE9nBZG3zmsxd+taTq1+5Ut5MjhhgwZtTnmfNx+bv4yl4aEd2S7tmcL
-# 8KCB/n4lkySjcs/O11DpYHr0UzizHaqpSLj+xT9dBYEKD4wRK3vlBX9SbMcgKvZC
-# lXjKM669ks77gS/Lti1K6x8EgZHkWj5uH1i01wUuXjX/Ha1Y6A2X/wbrrGqhy9f4
-# NAEMV/OcTvtuzPti7GlasLqGdfKRuZlxYMS7jSRJlAA=
+# aid89A+Uk/vvBwIM8u9hg7hfk0rr0dfhoP/Dtubh54LKBg/0ZzwJa6uSt3zelrvu
+# mNQbsSwRRHsqJaWJ0Ao64IPhKov8hPilSJX6NRRitf4SPYXfXikaRI103PZDmusz
+# Kl5SpeYPg9VmdAgn25uwFAjQO9Kx9gCWIo6uiq/00zIQfmJRjM55NU9dWr+qWjWS
+# xA7gYSN+Len0AOdk/Eo1d7vx2C2n6fCXA079HC/e3cS7eedCEIut1D14xLdif9aH
+# qNcOVk50FhHqIqH2TKo2mPrZcyS37fnsHctvKb4CTgKBNGtUD3zD7uRFBWc5aayu
+# koe/TgFPpNeevP8AMTbPSkocZp+a5eVvyUwlTdpQ1nNHf9vqzUj7jSsymOhuajn1
+# ydD6EM5ZQwXmTzXw+BLbc0XOUHaV/cuu5sBZs/QPa1Qge9WZUh8YGst3Lxc0dmG1
+# pJ0fMz/2UG/uZFC+RGJhW4i/yfjeEzd+mpxT0xd1sJF6eyCypP7rJfMn0LO3JufZ
+# iGNeHVero2vpG9jaxjeN66I4Fa4zVQ+dmIftHjGWZjmUn7U5GJdfuLmDxeTablCT
+# XtYeSgI55nkagDgWx+p4RbQEzsQBPPNlwvhh93Kvz7+x7Jbv3VwlXigyPHuriMc5
+# C0QIKQ/mN/n7ERBFGF61LLFWbK9Urd0W7i4N/Ld4sYE=
 # SIG # End signature block
diff --git a/scripts/UpdateSql.ps1 b/scripts/UpdateSql.ps1
index 5bf0114..9d98d52 100644
--- a/scripts/UpdateSql.ps1
+++ b/scripts/UpdateSql.ps1
@@ -262,17 +262,17 @@ Write-Host "Database is volledig up-to-date!" -ForegroundColor Green
 # RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt
 # ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAIT9wzT35FTtvDD4/5
 # khg1MA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMjYxMDE1MTMzNDU0WjAvBgkqhkiG9w0BCQQxIgQgX8Jz
+# BgkqhkiG9w0BCQUxDxcNMjYxMDIyMTM1OTMxWjAvBgkqhkiG9w0BCQQxIgQgX8Jz
 # mt8t4dFlf6dbnq2GYMYV89o+noBMKSYbxRzsddYwDQYJKoZIhvcNAQEBBQAEggIA
-# iwikvem7bl9lB6FvEw+zBC0NkZMwARTeS68RY2CMV3d+cQckcbgi0ck02TacmlSw
-# jqo5qbg6uiRoK523K1WQieIEPMRfqxU1RtVIWKux3hFPRi0aG5oip3fisCSH67UP
-# vT6cXrrMZ0qXFIt6VQmgFOgRLY29YuCQTMKZHa4Bet1W7uJckedTSMbthVMlcWvW
-# E/U8ZSfzNHMUZ7L02VGU5wIzDlxhKyB/njVbGmwZFa/lGCHDVuUegtz7LzpkE4oj
-# 9MY1u3tSHO3g5KbAObzPJOdNQn1ObtgO2Kwp+LNcIeiLjC5PzSg6F+hVfNoutTqN
-# w7fnM/M5AuKIBkIokN8bbXm9CsEwbyfevIduCY+xU1wqCp895T7wOGY4hKaDn9Lg
-# x92mthxykJNb3L9YuHjSGCLEJnKoJ4z4SRgY5PangSWyrB5GEeLjBAhCUAUdw8f2
-# wdDyn2JTX+ND7WA/TXoGXtxRfdvg013KBtuU3xnejU9/Atiu4j2y+Vr5LWuI5NLm
-# 1xP0wnBnu30LZ6mXUHZMQCM5OIcuc8x0jd9r/qf+LmNoCoaC4RYLpPm0wNW018nD
-# J3mVzQdX6Rbuosp1DsUKOPqkKD3V7IB2TlZwks0RKaLMN96YlhWALefKhuo9Gh+j
-# p9tHNspXN2GBd9GXR3G51kJkJ73QHJYq1ocDJkebCQY=
+# Kj5HuXiR76PIdc4NaMipB1wQHDpXGfBVQaRHsxriX6pw9m+dPTPJSR0MyfD9cjlB
+# TR8MppvOv7g6ZlHOyrX5aaNwEtw6h4VSH1oP1cgWLNneO4W7zmmVI+VuwmiA6NMk
+# pVWakW03ax9PBVcaB1+qn3ERF5Rnh5sx30GtGdVdODn/qvFl6Mvp1NepePxky3f5
+# o7DiTvSuV+unofLopLTf0yYi9DZBGNkfhxUMPTghFmzqhLuNtw3HFzdXzAaqDu3A
+# nE8kcUeZ+LpyfMnrvMy/lZV2Sg25yVT/rAwiL8EV7Z4BmjlE2jtZXp50GeltAywY
+# Yaer/NwF1rJrkaNT7elgcrjt4HU3Qv9JwcLBVRu65zmaY7QhRAX+ukIQUZ3COjQx
+# O9GsQbXUim5nThYA0+Jr/Hl51swoNDp/udNHU7DcdkUhr5znnZQsWIz24Ab7o9OE
+# X0bSpr/hAdbzKJCrlc/Uc1BAkKgzv4vZuPtYJVib3V5IW9kX9jdsP/KecwMDdmfH
+# c2RJR4fu6sEofQG1vXoKBQGJxx9fRUbg9uvM1ngke4sirbvlDFMCH+ziVa91b+hP
+# V1KO64gDNoW2aucjFJ15cGEZ5AFXQEu7nJKI1pBcDLcWimiQ0SR2AEX16B0sQj07
+# fohQitfrS1hPn8hx4dIWMOV8wfxOs8MEfyZf+mddtyM=
 # SIG # End signature block
diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1
index 1cdae67..6e06595 100644
--- a/scripts/Upgrader.ps1
+++ b/scripts/Upgrader.ps1
@@ -124,23 +124,6 @@ $StationZip = $ZipNames.EdosStationZip
 $LocalZip   = $ZipNames.SyncEdosLocalZip
 
 
-#$scriptPath = "c:\software\GetEdosStationZip.ps1"
-
-# 1. Check if the generator script exists
-#if (-not (Test-Path -Path $scriptPath)) {
-#    Write-Error "ALERT: Script missing at '$scriptPath'!"
-#    exit 1
-#}
-
-# 2. Execute the script to get the zip path/filename
-#$zip = & $scriptPath
-
-# 3. Check if $zip is empty, null, or whitespace
-#if ([string]::IsNullOrWhiteSpace($zip)) {
-#    Write-Error "ALERT: GetEdosStationZip.ps1 returned no value!"
-#    exit 1
-#}
-
 Write-Host "Copy soft"
 Expand-Archive -Force c:\software\$StationZip  "c:\program files\edos\edosStation"
 Expand-Archive -Force c:\software\$LocalZip  "c:\program files\edos\synceDosLocal"
@@ -184,8 +167,8 @@ exit
 # SIG # Begin signature block
 # MIIlPAYJKoZIhvcNAQcCoIIlLTCCJSkCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
 # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
-# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQU9zHVJ6acjiYJdicS5uX9+joQ
-# rVeggh9wMIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
+# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUiXkEPttQzMIy3BvOca6ee7Vr
+# gzWggh9wMIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
 # AQwFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD
 # VQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVk
 # IElEIFJvb3QgQ0EwHhcNMjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQsw
@@ -357,28 +340,28 @@ exit
 # A01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVND
 # S0NFTiBJQ1QgQ0ECAR8wCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAIoAKA
 # AKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIBCzEO
-# MAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFNJLoZyAENcvm9nalrUudk1h
-# P4jeMA0GCSqGSIb3DQEBAQUABIIBAFl7nXOOIq1h7JNJZ6dJ4THTRYv36HLIjqhy
-# rrIAeRjrR7OgFboUc3P5vvDtEtdqi+bkExFjGpK/rxpyqFYR2XqH02G+YG9Vhc04
-# XMyeL6zWO0RbDe8oKpHceyF21g++x2kFJamfJGjHD1xTHT3fA5HoqigQsicxk36G
-# XNguotSKDhO8JpYWSvB2aBqqKwlePjkbCEX939eDmCcxPFHOLSfF5q8hMweYPPQe
-# KAu+HQ55lu8WTl9GI2oE85YE8kN5nJrbf3oJ2zU5hhtnreLvpUYCld0HC0uUl0yd
-# b/a/BYUI/IQNFvqwl5oShTWq7fcAGsxY4GlER6AJP5QKpNjb2rKhggMmMIIDIgYJ
+# MAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFCDhLitrWfUw9oLGUlLNJ02B
+# iIUDMA0GCSqGSIb3DQEBAQUABIIBAGUC2Ihs/QTJdioHZKHmkm8QHNgxKkSy0rkT
+# jUEcH4/TPKRMq+/pHpyXeUr6A8MNFgjkKuvkjwpZy5XPFl4KoPvUxmTm0fjMjfh6
+# 5c3ss07Tv1rDSW03YNHpkIA0sr2tBPbuj3fByeHI6xh3CXtXeMGm0P7CH11mubKm
+# G7uXUanxo8OXMXuTBfbaC7rB5ngqmhDmDcGKAQL44Krre1+mJ50fJ0Gib1szzu17
+# TG3NouMJm4q6qPiI0xyWAM73KfTQ6DbXP1RbmMfjn9HJ1GW5vrDth2o6dUFAqWgz
+# qRz7Lzs4DAE3z/T3YdnpOa6yyVFIKdpZ335wzg94UmrzqVS3wdihggMmMIIDIgYJ
 # KoZIhvcNAQkGMYIDEzCCAw8CAQEwfTBpMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO
 # RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt
 # ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAIT9wzT35FTtvDD4/5
 # khg1MA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMjYxMDE1MTMzNDUzWjAvBgkqhkiG9w0BCQQxIgQgoco2
-# HpYdBcrP+K+0PF+H0BzKp5aJjQWFSqqg39LmMsIwDQYJKoZIhvcNAQEBBQAEggIA
-# cNxtn/M02V/CWWp4mrVu3yIRBjl3T7ConmacGkiInMT566X30yl9YP1v/ek2lLKx
-# xbR3lMlihHDQZuMER+h67k2CIm4UWG7zzxfDXrR1+F1OeK5FnbQ5AOYuN9dgwdRD
-# EQACsLhobkEf35/gJ2O3pMKINU8+8tt/dt7rSmeN758fxUu9sdvcOGapg4NjyNul
-# H4SpBBdlU92zHTINkVYXfcVHLQO+VZhNqRzUnwxH+DOU7Zzye7e6ZNCxfbZLv5PA
-# DKbZCBE2VxP1jHMcWMKsp+jb5MnesC3AZLwuHQnwhQw1EMQrwMWmwfs8E5la/Lwg
-# S7EEA4Ahk0n50WecLyNfOeUSArf2c9Gl613fQ7lk7XSzkeXW0I3G5U43R7LDAr1+
-# ecWTOkYNMN0bepgmxcL8qaihlfU6mSVWeqrIQ/o957+qpBr2SaCSReYG0VroqOhz
-# MYOZMYQCakQITn42otDk3Ty8wqrXTQwcSI4IqR9EaP4Kex24n7xoKi9C+5t93p6o
-# 6RkE9+gB9oUfq1PNfqgQIy8iJXbHG8jBPzSyMRz4It0GV5Yv0vDvBH1X8B/jpsA4
-# x2F1wPnhQBqeK3K21RAR702CzErv9gqD8T7+gFKTrsSjl+/PUZzw4awsssPVbNFt
-# HFwQjxU28kL0t7NdrOzwEDWWs3qENd8zjqS8lFbnazk=
+# BgkqhkiG9w0BCQUxDxcNMjYxMDIyMTM1OTMwWjAvBgkqhkiG9w0BCQQxIgQgOHLe
+# 10ZbE4bBoaCBq6mdTnn2K0ymg6PqwqP+YaWiyT4wDQYJKoZIhvcNAQEBBQAEggIA
+# P+BfQ1XdMydyUvDYUcHiIiOKFhvkbS1nZH1JuK6zpCXhOOhGjf7s5o3KFnYCFG8p
+# 80lXtRb9Odpoo7su2+PJxCjEyB1BQv/AL40pIic1fHFF0sxEdtI5WbYAIcvAzAr1
+# GAeAw8WMyZw3cBGHSP7SSEfCBpA4nf3a8RMU/3fLGcJmjYtWtSYmbpsi7/A8InUC
+# Ly65wl2KlJPpGhxuYBsGzWr0VzkUDLW4qw0yAor77T8xslBsi4giVLKys8/zlJCO
+# UKev3VTdEyIQTOdrcP5cbyrN6u8aWpUXKqrHRPiVn7VNS7C+NdRkBIsrbG9SEw1A
+# +ALHrDmOKCo10cJiPJmbpLl7FiGKkFR0jcT7m/ojXPFzYZYIN8Lma8HJCRG4j0OQ
+# 7mAfhDhusQcL5AMLnNPCy68Wqajinl1+Bo5IlaRJCryUG606HsgKE6JsJ5cFSHm7
+# nXCpJSL4sJfCV/t5e/hE2hZfxYGjDgKwPlSppzTjW2GJNiu5ZlURPG8T5txmxnDt
+# w0PpVdnfIFX+PsbfeQ5yHzTxDqrgzWM6iz8nHfrpMiswhM7kSCGmHqO7ZOwAsN03
+# 8b/z7kI1bQoNbkIXP55I3sLSiabFZCSvDZIgPu+pu0mP0AKBFkBxuy21XRggWmA/
+# 2MnoHYCWENpjTWErTWQjni4yAGAbZftM9VB0ECoowxs=
 # SIG # End signature block
diff --git a/scripts/installatie.ps1 b/scripts/installatie.ps1
index 95b39b8..eced68b 100644
--- a/scripts/installatie.ps1
+++ b/scripts/installatie.ps1
@@ -333,17 +333,17 @@ exit
 # RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt
 # ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAIT9wzT35FTtvDD4/5
 # khg1MA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMjYxMDE1MTMzNDUzWjAvBgkqhkiG9w0BCQQxIgQgvcaw
+# BgkqhkiG9w0BCQUxDxcNMjYxMDIyMTM1OTMxWjAvBgkqhkiG9w0BCQQxIgQgvcaw
 # S55NsqsO8cNQM/o5pcLWgsKlsCZImMggqSii8i4wDQYJKoZIhvcNAQEBBQAEggIA
-# oQsLPRgPwxMoYFjv4h0G0lQUXU+5R0byr+xtottb/j6/u2oKYXhiIw7t9EOmhYHQ
-# y8L1YsQiUtlkRRnCAQTRTTTSeHYZ1SDXFx6MMyIf3/VFe7cj4feDYiYW2z/0N9QM
-# broGG2u2PQN2UNNtWcyFmKW3qY53RGsBsKmMRi87GQibCHx1dhPOGPbG98DD6dD1
-# /bIW2Gfmw15JcEc2GmtbJkjYhxJt+ZLOks/RXtomv2lPkAgW4fuYgYb9xU7p3/Rz
-# Mn/PYmU5kvrce7YW8cJSUbg1fje+IFfRHkriAf3DtJ7guGGzOllRx9YOjqSPkZVD
-# nrJ+a0p/UQK1wWofeVB6ZNkTfhtdcdvK7gT8+mkgIUxUSptjKeotp0FRg684O3Zr
-# plRCSfVgAXDX/nupBhx1TIvHJvO+Jvgr7QlmScJn5vAxEdJzpRkM4CkTyLAjJgaZ
-# NVXTcabwZ13h5xLh/uzRfdjv8O5YM3Dg9+sbKDeotkBomZz2g+Av7Ptv5VzqI9/3
-# X+kRMl/XlkbrYXw7U/3PB1v6eZFf8LUTTtSZWCR1VBQ5Q5SS9GekcvkTL5WgaEUf
-# UvwfgRTGOqZce+qC4nJLyJiGyS39Xf0nDApX0N9Ah4suyVDzS/7xtKi39SvffNWS
-# EOcgRAwrqdSDjOWi4cQiCh9ypFZdsVevNn8xIxKBVio=
+# Pwzbcf1TrlVxZSmIhiv32rVDxPVp1CdY8zyMZuvCCxyvapbHNRCxr+pzanDwdbGc
+# pOxAazRL5fcywpQ192N4VUa+2C5bPPZ/GKN+7u42Acs4xXcNytEVsAKHsODqKcFI
+# QdreC6bpdCuyIVuFpeyl8TIssjYtN6XQF8Be/qZI1FOPi7EUS1WHlsuXs8YaI9Aw
+# 9pNXbLoR03Ry3ChPmepUskrrRmPmqRoL8S6f2KxZRggO0SfnoxjGRgNCu05Yjfgp
+# Ly3vuYxUQnlj5VXGmAH0Y0QZ4mSKyC58yq3DIsRWAi7r1gY3+3gTPCwPcaj8FMAB
+# Of0jIitHHE10c+dLsCPtl2uVjM/FM3y65e6COat7I/97sbdeNHr0GWhA7haJTUtZ
+# C8TkB5kuparhD0KcekQnZDZCOJdbZzI90nRDsj4Hbgk6H/Gp64g5udNdyK7Yf+dX
+# DSwkhQ6Zjey6AHSMkIUsa8BODz3WWfSWpoqxLgBBX4BhfD+LjfY4nWUEJDWM7wc5
+# OIDaTRjGD3OPcFFOyBqp/lDS5gsi/SuO4tIs87jvVCVN9MruKUdFcT0BOzfFOYv1
+# 478HTROFlLty6yoed+am4XFWarGOxyBcHCEm8paPgmZhkxSIiYzKbauBioaYEaZD
+# 7a7SGkAR56/s9zpGGmvtt+ID83OtrfUylZ7QcCkd5j0=
 # SIG # End signature block
diff --git a/scripts/installatie2.ps1 b/scripts/installatie2.ps1
index f0dcd97..8b609e3 100644
--- a/scripts/installatie2.ps1
+++ b/scripts/installatie2.ps1
@@ -193,17 +193,17 @@ exit
 # RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt
 # ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAIT9wzT35FTtvDD4/5
 # khg1MA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMjYxMDE1MTMzNDUzWjAvBgkqhkiG9w0BCQQxIgQg6Tgk
+# BgkqhkiG9w0BCQUxDxcNMjYxMDIyMTM1OTMxWjAvBgkqhkiG9w0BCQQxIgQg6Tgk
 # d9vgRJTrKaa/aNqr0ugqtMxl17/Df7q35ywcJSEwDQYJKoZIhvcNAQEBBQAEggIA
-# ibOtaTqympECVbspJ8qGfVvSHGRhkPiF9IrMl1ccSlMeGrizLKEcQRTifNLkeXSM
-# zMxS+dCeKstTHy33GMmCOeK6C0ZM7ZzSXGDFTuk0EUII6XhyX+cIcnlT3iEU5vWc
-# KdBNXOp4nyubNMnd9a7/0VSpDmZc5zvRTPExKYyHR6MHNOh1RwE1MxgukM/4z8Iy
-# xSPOtOUpmdWc0HT+1MuwzYOWADtLUzXnrAdlvQ0Sw8FqoeqpaXBfAPVvN8m/cJxK
-# UgyQaYtkYnUBtw1MGB+tflT7p3Rfh2Z8vMot/E7JjUTKkZff7TEiWelJPQdpr0Vg
-# 2qVJvrPCzuhy+0I2y4QNHHL0Y75sxCDk86D/pb3HC2dhlOtwq1+FBhqApp1m93al
-# Hj+cf4TE3vh9i3dPpgj/KybC/Vx0CBEl5nOs0I1zR6deCHJLacWW7LMyf+T26J72
-# Yp5fiN6aGoVZ7tIPHCIU6BTjGIWOxXgogXScfVagoVYowCnGPFqH8FoA3wHSSvM+
-# R4nmsiOBGzbTRPHiYtYJURqzoFnlOTfxbAXa7HHcS0ZQ1eSUwXKDG0/XFrMYWsSU
-# aSloo27GgtGjVXdez0iB4DQC5ED9+o/3d6RTqvoKY1aMODmp1/pg6zms/1jfflcQ
-# AR1V/aB1jVHLYhMTa8x35rPi/gj4d9pIwkbWXsWO+po=
+# HqPO9fcFB/S6MVIdOQbai3zNPkTRN42P6weOB9R9fAthapxxn7ZtdsHrAu6JvbGq
+# jo+jkgVgjbPxhuCOhFUFGT1E9jW3bJtgjDuXSdrkdmlqhOlaS5DppFsYgl81sJfd
+# uFJPPJsYsx/tgepF2d2p9tXz7EDuAFEiiJmGnLuMP3zWp8pdsdxWcbE+lmjLRGUN
+# WOqaFXILagR1UtkzWGriAQd0Z9+7c3OTxLgRYc5Xgjd+ZAuOG+FbBUMBEJCg86jC
+# +YQLsAbSWpVlujcu5+d6CfbcLXKmq95E6Vw2kGngfpomK2/VDqyXaoJJG6NCL/Pt
+# 61cx/WLJ2JM9LKTTk6iJY7ezg/ai0WH5p5rXcvGfgXbjvpEHrootzwntl/JBmAiv
+# WDhsON4udWbQ3NfSXySts+BFzH+DOWWJ7192sPY7y1diDXmB4n3wN7UYQNbxac4D
+# NPyf3afWVQvTXxj97R1cXDRH2gA/lLF7Acdr9+FWtUYXgcwRfajk70QR7PEKHM51
+# rxMoSB5xRNOX76FymKl3d+aBvvWlI3/547scaSPSCC3qR4A4GU/sOlBDnxloZHEH
+# AMiu67w+iRAwpUTneHvEXjgPg0ca1K67svFBI3xlSdChNMngrqF+orOmmc+Upn12
+# FhPn4VvV27X3jE58Rq7HqnJ3S4IyQ9KOPwHSsdN/OeY=
 # SIG # End signature block
diff --git a/syncEdosLocal/DataSet1.Designer.cs b/syncEdosLocal/DataSet1.Designer.cs
index f1c3ce9..e230ad9 100644
--- a/syncEdosLocal/DataSet1.Designer.cs
+++ b/syncEdosLocal/DataSet1.Designer.cs
@@ -2560,6 +2560,8 @@ namespace syncEdosLocal {
             
             private global::System.Data.DataColumn columnsynced;
             
+            private global::System.Data.DataColumn columnHardWare;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             public EPDIDDataTable() {
@@ -2657,6 +2659,14 @@ namespace syncEdosLocal {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public global::System.Data.DataColumn HardWareColumn {
+                get {
+                    return this.columnHardWare;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2694,7 +2704,7 @@ namespace syncEdosLocal {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-            public EPDIDRow AddEPDIDRow(int EPDID, string FirmWare, int First_Station, System.DateTime firstseen, int Last_Station, System.DateTime lastseen, byte epdType, bool synced) {
+            public EPDIDRow AddEPDIDRow(int EPDID, string FirmWare, int First_Station, System.DateTime firstseen, int Last_Station, System.DateTime lastseen, byte epdType, bool synced, string HardWare) {
                 EPDIDRow rowEPDIDRow = ((EPDIDRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         EPDID,
@@ -2704,7 +2714,8 @@ namespace syncEdosLocal {
                         Last_Station,
                         lastseen,
                         epdType,
-                        synced};
+                        synced,
+                        HardWare};
                 rowEPDIDRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEPDIDRow);
                 return rowEPDIDRow;
@@ -2742,6 +2753,7 @@ namespace syncEdosLocal {
                 this.columnlastseen = base.Columns["lastseen"];
                 this.columnepdType = base.Columns["epdType"];
                 this.columnsynced = base.Columns["synced"];
+                this.columnHardWare = base.Columns["HardWare"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2763,6 +2775,8 @@ namespace syncEdosLocal {
                 base.Columns.Add(this.columnepdType);
                 this.columnsynced = new global::System.Data.DataColumn("synced", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnsynced);
+                this.columnHardWare = new global::System.Data.DataColumn("HardWare", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnHardWare);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnEPDID}, true));
                 this.columnEPDID.AllowDBNull = false;
@@ -2770,6 +2784,7 @@ namespace syncEdosLocal {
                 this.columnFirmWare.MaxLength = 50;
                 this.columnFirst_Station.AllowDBNull = false;
                 this.columnfirstseen.AllowDBNull = false;
+                this.columnHardWare.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2931,6 +2946,10 @@ namespace syncEdosLocal {
             
             private global::System.Data.DataColumn columnWriteTime;
             
+            private global::System.Data.DataColumn columnDllVersion;
+            
+            private global::System.Data.DataColumn columnr_ErrorUnexpectedResponse;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             public EPDDeviceLogDataTable() {
@@ -3076,6 +3095,22 @@ namespace syncEdosLocal {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public global::System.Data.DataColumn DllVersionColumn {
+                get {
+                    return this.columnDllVersion;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public global::System.Data.DataColumn r_ErrorUnexpectedResponseColumn {
+                get {
+                    return this.columnr_ErrorUnexpectedResponse;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -3113,7 +3148,23 @@ namespace syncEdosLocal {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-            public EPDDeviceLogRow AddEPDDeviceLogRow(int EPDID, int ID_Station, int ID_Visit, System.DateTime updated, int BatNoload_mV, int Batload_mV, int CPU_mV, int r_InvalidState, int r_OperationTimeout, int r_InsufficientPriv, int r_OperationFailed, int r_OtherError, bool Registered, int WriteTime) {
+            public EPDDeviceLogRow AddEPDDeviceLogRow(
+                        int EPDID, 
+                        int ID_Station, 
+                        int ID_Visit, 
+                        System.DateTime updated, 
+                        int BatNoload_mV, 
+                        int Batload_mV, 
+                        int CPU_mV, 
+                        int r_InvalidState, 
+                        int r_OperationTimeout, 
+                        int r_InsufficientPriv, 
+                        int r_OperationFailed, 
+                        int r_OtherError, 
+                        bool Registered, 
+                        int WriteTime, 
+                        string DllVersion, 
+                        int r_ErrorUnexpectedResponse) {
                 EPDDeviceLogRow rowEPDDeviceLogRow = ((EPDDeviceLogRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         EPDID,
@@ -3129,7 +3180,9 @@ namespace syncEdosLocal {
                         r_OperationFailed,
                         r_OtherError,
                         Registered,
-                        WriteTime};
+                        WriteTime,
+                        DllVersion,
+                        r_ErrorUnexpectedResponse};
                 rowEPDDeviceLogRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEPDDeviceLogRow);
                 return rowEPDDeviceLogRow;
@@ -3174,6 +3227,8 @@ namespace syncEdosLocal {
                 this.columnr_OtherError = base.Columns["r_OtherError"];
                 this.columnRegistered = base.Columns["Registered"];
                 this.columnWriteTime = base.Columns["WriteTime"];
+                this.columnDllVersion = base.Columns["DllVersion"];
+                this.columnr_ErrorUnexpectedResponse = base.Columns["r_ErrorUnexpectedResponse"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3207,6 +3262,10 @@ namespace syncEdosLocal {
                 base.Columns.Add(this.columnRegistered);
                 this.columnWriteTime = new global::System.Data.DataColumn("WriteTime", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnWriteTime);
+                this.columnDllVersion = new global::System.Data.DataColumn("DllVersion", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDllVersion);
+                this.columnr_ErrorUnexpectedResponse = new global::System.Data.DataColumn("r_ErrorUnexpectedResponse", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnr_ErrorUnexpectedResponse);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnID_Station,
                                 this.columnID_Visit}, true));
@@ -3222,6 +3281,7 @@ namespace syncEdosLocal {
                 this.columnr_InsufficientPriv.AllowDBNull = false;
                 this.columnr_OperationFailed.AllowDBNull = false;
                 this.columnr_OtherError.AllowDBNull = false;
+                this.columnDllVersion.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6279,6 +6339,22 @@ namespace syncEdosLocal {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public string HardWare {
+                get {
+                    try {
+                        return ((string)(this[this.tableEPDID.HardWareColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'HardWare\' in table \'EPDID\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEPDID.HardWareColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             public bool IsFirmWareNull() {
@@ -6338,6 +6414,18 @@ namespace syncEdosLocal {
             public void SetsyncedNull() {
                 this[this.tableEPDID.syncedColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public bool IsHardWareNull() {
+                return this.IsNull(this.tableEPDID.HardWareColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public void SetHardWareNull() {
+                this[this.tableEPDID.HardWareColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -6518,6 +6606,39 @@ namespace syncEdosLocal {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public string DllVersion {
+                get {
+                    try {
+                        return ((string)(this[this.tableEPDDeviceLog.DllVersionColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'DllVersion\' in table \'EPDDeviceLog\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEPDDeviceLog.DllVersionColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public int r_ErrorUnexpectedResponse {
+                get {
+                    try {
+                        return ((int)(this[this.tableEPDDeviceLog.r_ErrorUnexpectedResponseColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'r_ErrorUnexpectedResponse\' in table \'EPDDeviceLog\' is DBNul" +
+                                "l.", e);
+                    }
+                }
+                set {
+                    this[this.tableEPDDeviceLog.r_ErrorUnexpectedResponseColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
             public bool IsRegisteredNull() {
@@ -6541,6 +6662,30 @@ namespace syncEdosLocal {
             public void SetWriteTimeNull() {
                 this[this.tableEPDDeviceLog.WriteTimeColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public bool IsDllVersionNull() {
+                return this.IsNull(this.tableEPDDeviceLog.DllVersionColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public void SetDllVersionNull() {
+                this[this.tableEPDDeviceLog.DllVersionColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public bool Isr_ErrorUnexpectedResponseNull() {
+                return this.IsNull(this.tableEPDDeviceLog.r_ErrorUnexpectedResponseColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
+            public void Setr_ErrorUnexpectedResponseNull() {
+                this[this.tableEPDDeviceLog.r_ErrorUnexpectedResponseColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -7465,6 +7610,7 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             tableMapping.ColumnMappings.Add("lastseen", "lastseen");
             tableMapping.ColumnMappings.Add("epdType", "epdType");
             tableMapping.ColumnMappings.Add("synced", "synced");
+            tableMapping.ColumnMappings.Add("HardWare", "HardWare");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
@@ -7681,15 +7827,9 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             tableMapping.ColumnMappings.Add("r_OtherError", "r_OtherError");
             tableMapping.ColumnMappings.Add("Registered", "Registered");
             tableMapping.ColumnMappings.Add("WriteTime", "WriteTime");
+            tableMapping.ColumnMappings.Add("DllVersion", "DllVersion");
+            tableMapping.ColumnMappings.Add("r_ErrorUnexpectedResponse", "r_ErrorUnexpectedResponse");
             this._adapter.TableMappings.Add(tableMapping);
-            this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
-            this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = "DELETE FROM [EPDDeviceLog] WHERE (([EPDID] = @Original_EPDID) AND ([ID_Station] =" +
-                " @Original_ID_Station) AND ([ID_Visit] = @Original_ID_Visit))";
-            this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EPDID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EPDID", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ID_Station", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ID_Station", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ID_Visit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ID_Visit", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7705,7 +7845,7 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "EPDDeviceLogToSync";
+            this._commandCollection[0].CommandText = "dbo.EPDDeviceLogToSync";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ID_STATION", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -7759,35 +7899,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             this.Adapter.Fill(dataTable);
             return dataTable;
         }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int Update(DataSet1.EPDDeviceLogDataTable dataTable) {
-            return this.Adapter.Update(dataTable);
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int Update(DataSet1 dataSet) {
-            return this.Adapter.Update(dataSet, "EPDDeviceLog");
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int Update(global::System.Data.DataRow dataRow) {
-            return this.Adapter.Update(new global::System.Data.DataRow[] {
-                        dataRow});
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int Update(global::System.Data.DataRow[] dataRows) {
-            return this.Adapter.Update(dataRows);
-        }
     }
     
     /// <summary>
@@ -7845,9 +7956,11 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@r_OperationTimeout", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@r_InsufficientPriv", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@r_OperationFailed", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@r_ErrorUnexpectedResponse", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@r_OtherError", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Registered", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WriteTime", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DllVersion", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).Connection = new global::System.Data.SqlClient.SqlConnection(global::syncEdosLocal.Properties.Settings.Default.eDosConnectionString);
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).CommandText = "dbo.EPDDeviceUpdate";
@@ -7860,6 +7973,7 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@firstseen", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Last_Station", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@lastseen", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[3])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HardWare", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7922,7 +8036,23 @@ namespace syncEdosLocal.DataSet1TableAdapters {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int EpdDeviceLogUpdate(global::System.Nullable<int> EPDID, global::System.Nullable<int> ID_Station, global::System.Nullable<int> ID_Visit, global::System.Nullable<global::System.DateTime> updated, global::System.Nullable<int> BatNoload_mV, global::System.Nullable<int> Batload_mV, global::System.Nullable<int> CPU_mv, global::System.Nullable<int> r_InvalidState, global::System.Nullable<int> r_OperationTimeout, global::System.Nullable<int> r_InsufficientPriv, global::System.Nullable<int> r_OperationFailed, global::System.Nullable<int> r_OtherError, global::System.Nullable<bool> Registered, global::System.Nullable<int> WriteTime) {
+        public virtual object EpdDeviceLogUpdate(
+                    global::System.Nullable<int> EPDID, 
+                    global::System.Nullable<int> ID_Station, 
+                    global::System.Nullable<int> ID_Visit, 
+                    global::System.Nullable<global::System.DateTime> updated, 
+                    global::System.Nullable<int> BatNoload_mV, 
+                    global::System.Nullable<int> Batload_mV, 
+                    global::System.Nullable<int> CPU_mv, 
+                    global::System.Nullable<int> r_InvalidState, 
+                    global::System.Nullable<int> r_OperationTimeout, 
+                    global::System.Nullable<int> r_InsufficientPriv, 
+                    global::System.Nullable<int> r_OperationFailed, 
+                    global::System.Nullable<int> r_ErrorUnexpectedResponse, 
+                    global::System.Nullable<int> r_OtherError, 
+                    global::System.Nullable<bool> Registered, 
+                    global::System.Nullable<int> WriteTime, 
+                    string DllVersion) {
             global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2]));
             if ((EPDID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(EPDID.Value));
@@ -7990,45 +8120,63 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             else {
                 command.Parameters[11].Value = global::System.DBNull.Value;
             }
-            if ((r_OtherError.HasValue == true)) {
-                command.Parameters[12].Value = ((int)(r_OtherError.Value));
+            if ((r_ErrorUnexpectedResponse.HasValue == true)) {
+                command.Parameters[12].Value = ((int)(r_ErrorUnexpectedResponse.Value));
             }
             else {
                 command.Parameters[12].Value = global::System.DBNull.Value;
             }
-            if ((Registered.HasValue == true)) {
-                command.Parameters[13].Value = ((bool)(Registered.Value));
+            if ((r_OtherError.HasValue == true)) {
+                command.Parameters[13].Value = ((int)(r_OtherError.Value));
             }
             else {
                 command.Parameters[13].Value = global::System.DBNull.Value;
             }
-            if ((WriteTime.HasValue == true)) {
-                command.Parameters[14].Value = ((int)(WriteTime.Value));
+            if ((Registered.HasValue == true)) {
+                command.Parameters[14].Value = ((bool)(Registered.Value));
             }
             else {
                 command.Parameters[14].Value = global::System.DBNull.Value;
             }
+            if ((WriteTime.HasValue == true)) {
+                command.Parameters[15].Value = ((int)(WriteTime.Value));
+            }
+            else {
+                command.Parameters[15].Value = global::System.DBNull.Value;
+            }
+            if ((DllVersion == null)) {
+                command.Parameters[16].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[16].Value = ((string)(DllVersion));
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
                 command.Connection.Open();
             }
-            int returnValue;
+            object returnValue;
             try {
-                returnValue = command.ExecuteNonQuery();
+                returnValue = command.ExecuteScalar();
             }
             finally {
                 if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
                     command.Connection.Close();
                 }
             }
-            return returnValue;
+            if (((returnValue == null) 
+                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+                return null;
+            }
+            else {
+                return ((object)(returnValue));
+            }
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int EPDDeviceUpdate(global::System.Nullable<int> EPDID, string FirmWare, global::System.Nullable<byte> epdType, global::System.Nullable<int> First_Station, global::System.Nullable<global::System.DateTime> firstseen, global::System.Nullable<int> Last_Station, global::System.Nullable<global::System.DateTime> lastseen) {
+        public virtual object EPDDeviceUpdate(global::System.Nullable<int> EPDID, string FirmWare, global::System.Nullable<byte> epdType, global::System.Nullable<int> First_Station, global::System.Nullable<global::System.DateTime> firstseen, global::System.Nullable<int> Last_Station, global::System.Nullable<global::System.DateTime> lastseen, string HardWare) {
             global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[3]));
             if ((EPDID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(EPDID.Value));
@@ -8072,21 +8220,33 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             else {
                 command.Parameters[7].Value = global::System.DBNull.Value;
             }
+            if ((HardWare == null)) {
+                command.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[8].Value = ((string)(HardWare));
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
                 command.Connection.Open();
             }
-            int returnValue;
+            object returnValue;
             try {
-                returnValue = command.ExecuteNonQuery();
+                returnValue = command.ExecuteScalar();
             }
             finally {
                 if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
                     command.Connection.Close();
                 }
             }
-            return returnValue;
+            if (((returnValue == null) 
+                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+                return null;
+            }
+            else {
+                return ((object)(returnValue));
+            }
         }
     }
     
@@ -8108,8 +8268,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
         
         private EPDIDTableAdapter _ePDIDTableAdapter;
         
-        private EPDDeviceLogTableAdapter _ePDDeviceLogTableAdapter;
-        
         private bool _backupDataSetBeforeUpdate;
         
         private global::System.Data.IDbConnection _connection;
@@ -8167,20 +8325,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
             }
         }
         
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
-        [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" +
-            "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" +
-            "a", "System.Drawing.Design.UITypeEditor")]
-        public EPDDeviceLogTableAdapter EPDDeviceLogTableAdapter {
-            get {
-                return this._ePDDeviceLogTableAdapter;
-            }
-            set {
-                this._ePDDeviceLogTableAdapter = value;
-            }
-        }
-        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
         public bool BackupDataSetBeforeUpdate {
@@ -8212,10 +8356,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                             && (this._ePDIDTableAdapter.Connection != null))) {
                     return this._ePDIDTableAdapter.Connection;
                 }
-                if (((this._ePDDeviceLogTableAdapter != null) 
-                            && (this._ePDDeviceLogTableAdapter.Connection != null))) {
-                    return this._ePDDeviceLogTableAdapter.Connection;
-                }
                 return null;
             }
             set {
@@ -8238,9 +8378,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                 if ((this._ePDIDTableAdapter != null)) {
                     count = (count + 1);
                 }
-                if ((this._ePDDeviceLogTableAdapter != null)) {
-                    count = (count + 1);
-                }
                 return count;
             }
         }
@@ -8279,15 +8416,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                     allChangedRows.AddRange(updatedRows);
                 }
             }
-            if ((this._ePDDeviceLogTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.EPDDeviceLog.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._ePDDeviceLogTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             return result;
         }
         
@@ -8322,14 +8450,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                     allAddedRows.AddRange(addedRows);
                 }
             }
-            if ((this._ePDDeviceLogTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.EPDDeviceLog.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._ePDDeviceLogTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             return result;
         }
         
@@ -8340,14 +8460,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "18.0.0.0")]
         private int UpdateDeletedRows(DataSet1 dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows) {
             int result = 0;
-            if ((this._ePDDeviceLogTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.EPDDeviceLog.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._ePDDeviceLogTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._ePDIDTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.EPDID.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -8426,11 +8538,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                 throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" +
                         "tring.");
             }
-            if (((this._ePDDeviceLogTableAdapter != null) 
-                        && (this.MatchTableAdapterConnection(this._ePDDeviceLogTableAdapter.Connection) == false))) {
-                throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" +
-                        "tring.");
-            }
             global::System.Data.IDbConnection workConnection = this.Connection;
             if ((workConnection == null)) {
                 throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" +
@@ -8490,15 +8597,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                         adaptersWithAcceptChangesDuringUpdate.Add(this._ePDIDTableAdapter.Adapter);
                     }
                 }
-                if ((this._ePDDeviceLogTableAdapter != null)) {
-                    revertConnections.Add(this._ePDDeviceLogTableAdapter, this._ePDDeviceLogTableAdapter.Connection);
-                    this._ePDDeviceLogTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection));
-                    this._ePDDeviceLogTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction));
-                    if (this._ePDDeviceLogTableAdapter.Adapter.AcceptChangesDuringUpdate) {
-                        this._ePDDeviceLogTableAdapter.Adapter.AcceptChangesDuringUpdate = false;
-                        adaptersWithAcceptChangesDuringUpdate.Add(this._ePDDeviceLogTableAdapter.Adapter);
-                    }
-                }
                 // 
                 //---- Perform updates -----------
                 //
@@ -8569,10 +8667,6 @@ namespace syncEdosLocal.DataSet1TableAdapters {
                     this._ePDIDTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._ePDIDTableAdapter]));
                     this._ePDIDTableAdapter.Transaction = null;
                 }
-                if ((this._ePDDeviceLogTableAdapter != null)) {
-                    this._ePDDeviceLogTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._ePDDeviceLogTableAdapter]));
-                    this._ePDDeviceLogTableAdapter.Transaction = null;
-                }
                 if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) {
                     global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count];
                     adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters);
diff --git a/syncEdosLocal/DataSet1.xsd b/syncEdosLocal/DataSet1.xsd
index b50fef5..aeb9783 100644
--- a/syncEdosLocal/DataSet1.xsd
+++ b/syncEdosLocal/DataSet1.xsd
@@ -300,7 +300,7 @@
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="true">
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.EPDDeviceSetSynced</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -319,25 +319,16 @@
               <Mapping SourceColumn="lastseen" DataSetColumn="lastseen" />
               <Mapping SourceColumn="epdType" DataSetColumn="epdType" />
               <Mapping SourceColumn="synced" DataSetColumn="synced" />
+              <Mapping SourceColumn="HardWare" DataSetColumn="HardWare" />
             </Mappings>
             <Sources />
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="EPDDeviceLogTableAdapter" GeneratorDataComponentClassName="EPDDeviceLogTableAdapter" Name="EPDDeviceLog" UserDataComponentName="EPDDeviceLogTableAdapter">
             <MainSource>
               <DbSource ConnectionRef="eDosLocalConnectionString (Settings)" DbObjectName="eDosLocal.dbo.EPDDeviceLogToSync" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
-                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [EPDDeviceLog] WHERE (([EPDID] = @Original_EPDID) AND ([ID_Station] = @Original_ID_Station) AND ([ID_Visit] = @Original_ID_Visit))</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_EPDID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="EPDID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ID_Station" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ID_Station" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ID_Visit" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ID_Visit" SourceColumnNullMapping="false" SourceVersion="Original" />
-                    </Parameters>
-                  </DbCommand>
-                </DeleteCommand>
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>EPDDeviceLogToSync</CommandText>
+                    <CommandText>dbo.EPDDeviceLogToSync</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID_STATION" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -362,6 +353,8 @@
               <Mapping SourceColumn="r_OtherError" DataSetColumn="r_OtherError" />
               <Mapping SourceColumn="Registered" DataSetColumn="Registered" />
               <Mapping SourceColumn="WriteTime" DataSetColumn="WriteTime" />
+              <Mapping SourceColumn="DllVersion" DataSetColumn="DllVersion" />
+              <Mapping SourceColumn="r_ErrorUnexpectedResponse" DataSetColumn="r_ErrorUnexpectedResponse" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -389,7 +382,7 @@ WHERE  (ID_Station = @ID_Station)</CommandText>
               </DbCommand>
             </SelectCommand>
           </DbSource>
-          <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.EpdDeviceLogUpdate" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="EpdDeviceLogUpdate" MethodsParameterType="CLR" Modifier="Public" Name="EpdDeviceLogUpdate" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="EpdDeviceLogUpdate">
+          <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.EpdDeviceLogUpdate" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="EpdDeviceLogUpdate" MethodsParameterType="CLR" Modifier="Public" Name="EpdDeviceLogUpdate" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="EpdDeviceLogUpdate">
             <SelectCommand>
               <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                 <CommandText>dbo.EpdDeviceLogUpdate</CommandText>
@@ -406,14 +399,16 @@ WHERE  (ID_Station = @ID_Station)</CommandText>
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@r_OperationTimeout" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@r_InsufficientPriv" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@r_OperationFailed" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@r_ErrorUnexpectedResponse" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@r_OtherError" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Registered" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@WriteTime" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@DllVersion" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                 </Parameters>
               </DbCommand>
             </SelectCommand>
           </DbSource>
-          <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.EPDDeviceUpdate" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="EPDDeviceUpdate" MethodsParameterType="CLR" Modifier="Public" Name="EPDDeviceUpdate" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="EPDDeviceUpdate">
+          <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.EPDDeviceUpdate" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="EPDDeviceUpdate" MethodsParameterType="CLR" Modifier="Public" Name="EPDDeviceUpdate" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="EPDDeviceUpdate">
             <SelectCommand>
               <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                 <CommandText>dbo.EPDDeviceUpdate</CommandText>
@@ -426,6 +421,7 @@ WHERE  (ID_Station = @ID_Station)</CommandText>
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@firstseen" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Last_Station" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                   <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@lastseen" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@HardWare" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                 </Parameters>
               </DbCommand>
             </SelectCommand>
@@ -576,6 +572,13 @@ WHERE  (ID_Station = @ID_Station)</CommandText>
               <xs:element name="lastseen" msprop:Generator_ColumnPropNameInTable="lastseenColumn" msprop:Generator_ColumnPropNameInRow="lastseen" msprop:Generator_UserColumnName="lastseen" msprop:Generator_ColumnVarNameInTable="columnlastseen" type="xs:dateTime" minOccurs="0" />
               <xs:element name="epdType" msprop:Generator_ColumnPropNameInTable="epdTypeColumn" msprop:Generator_ColumnPropNameInRow="epdType" msprop:Generator_UserColumnName="epdType" msprop:Generator_ColumnVarNameInTable="columnepdType" type="xs:unsignedByte" minOccurs="0" />
               <xs:element name="synced" msprop:Generator_ColumnPropNameInTable="syncedColumn" msprop:Generator_ColumnPropNameInRow="synced" msprop:Generator_UserColumnName="synced" msprop:Generator_ColumnVarNameInTable="columnsynced" type="xs:boolean" minOccurs="0" />
+              <xs:element name="HardWare" msprop:Generator_ColumnPropNameInRow="HardWare" msprop:Generator_ColumnPropNameInTable="HardWareColumn" msprop:Generator_ColumnVarNameInTable="columnHardWare" msprop:Generator_UserColumnName="HardWare" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -596,6 +599,14 @@ WHERE  (ID_Station = @ID_Station)</CommandText>
               <xs:element name="r_OtherError" msprop:Generator_ColumnPropNameInTable="r_OtherErrorColumn" msprop:Generator_ColumnPropNameInRow="r_OtherError" msprop:Generator_UserColumnName="r_OtherError" msprop:Generator_ColumnVarNameInTable="columnr_OtherError" type="xs:int" />
               <xs:element name="Registered" msprop:Generator_ColumnPropNameInTable="RegisteredColumn" msprop:Generator_ColumnPropNameInRow="Registered" msprop:Generator_UserColumnName="Registered" msprop:Generator_ColumnVarNameInTable="columnRegistered" type="xs:boolean" minOccurs="0" />
               <xs:element name="WriteTime" msprop:Generator_ColumnPropNameInTable="WriteTimeColumn" msprop:Generator_ColumnPropNameInRow="WriteTime" msprop:Generator_UserColumnName="WriteTime" msprop:Generator_ColumnVarNameInTable="columnWriteTime" type="xs:int" minOccurs="0" />
+              <xs:element name="DllVersion" msprop:Generator_ColumnPropNameInRow="DllVersion" msprop:Generator_ColumnPropNameInTable="DllVersionColumn" msprop:Generator_ColumnVarNameInTable="columnDllVersion" msprop:Generator_UserColumnName="DllVersion" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="r_ErrorUnexpectedResponse" msprop:Generator_ColumnPropNameInRow="r_ErrorUnexpectedResponse" msprop:Generator_ColumnPropNameInTable="r_ErrorUnexpectedResponseColumn" msprop:Generator_ColumnVarNameInTable="columnr_ErrorUnexpectedResponse" msprop:Generator_UserColumnName="r_ErrorUnexpectedResponse" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/syncEdosLocal/DataSet1.xss b/syncEdosLocal/DataSet1.xss
index 8db9462..3770f2c 100644
--- a/syncEdosLocal/DataSet1.xss
+++ b/syncEdosLocal/DataSet1.xss
@@ -4,13 +4,13 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-11" ViewPortY="27" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-11" ViewPortY="180" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:LocalVisits" ZOrder="5" X="369" Y="19" Height="365" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
     <Shape ID="DesignTable:CentralVisits" ZOrder="4" X="760" Y="20" Height="365" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:EPDID" ZOrder="2" X="20" Y="43" Height="273" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
-    <Shape ID="DesignTable:EPDDeviceLog" ZOrder="3" X="54" Y="328" Height="365" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="864" Y="413" Height="103" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
+    <Shape ID="DesignTable:EPDID" ZOrder="3" X="20" Y="43" Height="296" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
+    <Shape ID="DesignTable:EPDDeviceLog" ZOrder="1" X="54" Y="328" Height="365" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="2" X="864" Y="464" Height="103" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file
diff --git a/syncEdosLocal/Program.cs b/syncEdosLocal/Program.cs
index 9081989..c27eee8 100644
--- a/syncEdosLocal/Program.cs
+++ b/syncEdosLocal/Program.cs
@@ -387,7 +387,7 @@ namespace syncEdosLocal
 
                     foreach (DataSet1.EPDIDRow er in ds.EPDID)
                     {
-                        qta.EPDDeviceUpdate(er.EPDID, er.FirmWare, er.epdType, er.First_Station, er.firstseen, er.Last_Station, er.lastseen);
+                        qta.EPDDeviceUpdate(er.EPDID, er.FirmWare, er.epdType, er.First_Station, er.firstseen, er.Last_Station, er.lastseen,er.HardWare);
                         er.synced = true;
                     }
                     ttd.Update(ds.EPDID);
@@ -401,7 +401,7 @@ namespace syncEdosLocal
 
                     foreach (DataSet1.EPDDeviceLogRow el in ds.EPDDeviceLog)
                     {
-                        qta.EpdDeviceLogUpdate(el.EPDID,el.ID_Station,el.ID_Visit,el.updated,el.BatNoload_mV,el.Batload_mV,el.CPU_mV,el.r_InvalidState,el.r_OperationTimeout,el.r_InsufficientPriv,el.r_OperationFailed,el.r_OtherError,el.Registered,el.WriteTime);
+                        qta.EpdDeviceLogUpdate(el.EPDID,el.ID_Station,el.ID_Visit,el.updated,el.BatNoload_mV,el.Batload_mV,el.CPU_mV,el.r_InvalidState,el.r_OperationTimeout,el.r_InsufficientPriv,el.r_OperationFailed,el.r_ErrorUnexpectedResponse,el.r_OtherError,el.Registered,el.WriteTime,el.DllVersion);
                     }
                     //tta.DynamicConnectionString = Properties.Settings.Default.eDosConnectionString;
                     //tta.Update(ds.EPDDeviceLog);
diff --git a/syncEdosLocal/Properties/AssemblyInfo.cs b/syncEdosLocal/Properties/AssemblyInfo.cs
index 84ef7f7..8031884 100644
--- a/syncEdosLocal/Properties/AssemblyInfo.cs
+++ b/syncEdosLocal/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]