Index: vhUnitTest/DOM/PM/TBX/impl/TOBSetEenheidBepaler/BepaalEenheidIdentificatie/Test.cls.xml
===================================================================
diff -u -r33909 -r38945
--- vhUnitTest/DOM/PM/TBX/impl/TOBSetEenheidBepaler/BepaalEenheidIdentificatie/Test.cls.xml	(.../Test.cls.xml)	(revision 33909)
+++ vhUnitTest/DOM/PM/TBX/impl/TOBSetEenheidBepaler/BepaalEenheidIdentificatie/Test.cls.xml	(.../Test.cls.xml)	(revision 38945)
@@ -20,15 +20,18 @@
 <Implementation><![CDATA[
 	Do ..AssertTOBSetEenheid("A", "", "", "",65, "3560")
 
-	Do ..AssertTOBSetEenheid("A","N",270,567,30, "3030")
-	Do ..AssertTOBSetEenheid("A","N",270,568,30, "3130")
+	Do ..AssertTOBSetEenheid("A","N",270,467,30, "3030")
+	Do ..AssertTOBSetEenheid("A","N",270,468,30, "3130")
 	
-	Do ..AssertTOBSetEenheid("A","M",600,800,30, "3530")
+	Do ..AssertTOBSetEenheid("A","M",600,517,30, "3530")
+	Do ..AssertTOBSetEenheid("A","M",600,518,30, "3560")
 	Do ..AssertTOBSetEenheid("A","M",650, "",30, "3560")
 	
-	Do ..AssertTOBSetEenheid("A","K",600,800,30, "3530")
+	Do ..AssertTOBSetEenheid("A","K",600,517,30, "3530")
+	Do ..AssertTOBSetEenheid("A","K",600,518,30, "3560")
 	
-	Do ..AssertTOBSetEenheid("A","D",350,467,30, "3330")
+	Do ..AssertTOBSetEenheid("A","D",400,367,30, "3330")
+	Do ..AssertTOBSetEenheid("A","D",400,368,30, "3530")
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/TBX/impl/TOBSetEenheidBepaler.cls.xml
===================================================================
diff -u -r34203 -r38945
--- DOM/PM/TBX/impl/TOBSetEenheidBepaler.cls.xml	(.../TOBSetEenheidBepaler.cls.xml)	(revision 34203)
+++ DOM/PM/TBX/impl/TOBSetEenheidBepaler.cls.xml	(.../TOBSetEenheidBepaler.cls.xml)	(revision 38945)
@@ -7,8 +7,11 @@
 <FormalSpec>DesignCode:%String,LadeHoogte:%String,LadeDiepte:%Numeric,InternBreedte:%Numeric,Draagkracht:%Numeric</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#define KB400mm   368
+	#define KB450mm   418
 	#define KB500mm   468
-	#define KB600mm   568
+	#define KB550mm   518
+	#define KB800mm   768
 	
 	If (DesignCode '= ##class(DOM.PM.enu.TBXDesigncode).Antaro()) {
 		Do ..GooiTOBEenheidExceptie("Ongeldige DesignCode '"_DesignCode_"'.")
@@ -26,17 +29,33 @@
 		// Hoogte M en N 
 		If ##class(TECH.StringUtils).Equals(LadeHoogte, "M", "N") {
 			
-			If ##class(TECH.StringUtils).Equals(LadeDiepte, 270, 300) {					If InternBreedte < $$$KB600mm 	{ Set TOBIdentificatie = "3030" }
+			If ##class(TECH.StringUtils).Equals(LadeDiepte, 270, 300) {					If InternBreedte < $$$KB500mm 	{ Set TOBIdentificatie = "3030" }
 																						Else 							{ Set TOBIdentificatie = "3130" }
 			}
 
-			ElseIf##class(TECH.StringUtils).Equals(LadeDiepte, 350, 400, 450, 500) {	Set TOBIdentificatie = "3330"
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 350) {					Set TOBIdentificatie = "3330"
 			}
 			
-			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 550, 600) {				If InternBreedte < $$$KB500mm 	{ Set TOBIdentificatie = "3330" }
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 400) {					If InternBreedte < $$$KB800mm 	{ Set TOBIdentificatie = "3330" }
 																						Else 							{ Set TOBIdentificatie = "3530" }
 			}
 			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 450) {					If InternBreedte < $$$KB450mm 	{ Set TOBIdentificatie = "3330" }
+																						Else 							{ Set TOBIdentificatie = "3530" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 500) {					If InternBreedte < $$$KB400mm 	{ Set TOBIdentificatie = "3330" }
+																						Else 							{ Set TOBIdentificatie = "3530" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 550) {					If InternBreedte < $$$KB800mm 	{ Set TOBIdentificatie = "3530" }
+																						Else 							{ Set TOBIdentificatie = "3560" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 600) {					If InternBreedte < $$$KB550mm 	{ Set TOBIdentificatie = "3530" }
+																						Else 							{ Set TOBIdentificatie = "3560" }
+			}
+			
 			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 650) {					Set TOBIdentificatie = "3560"
 			}
 			
@@ -51,13 +70,28 @@
 			If ##class(TECH.StringUtils).Equals(LadeDiepte, 270, 300) {					Set TOBIdentificatie = "3130"
 			}
 			
-			ElseIf##class(TECH.StringUtils).Equals(LadeDiepte, 350, 400, 450) {			Set TOBIdentificatie = "3330"
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 350) {					Set TOBIdentificatie = "3330"
 			}
 			
-			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 500, 550, 600) {		If InternBreedte < $$$KB500mm 	{ Set TOBIdentificatie = "3330" }
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 400) {					If InternBreedte < $$$KB800mm 	{ Set TOBIdentificatie = "3330" }
 																						Else 							{ Set TOBIdentificatie = "3530" }
 			}
 			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 450) {					If InternBreedte < $$$KB450mm 	{ Set TOBIdentificatie = "3330" }
+																						Else 							{ Set TOBIdentificatie = "3530" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 500) {					Set TOBIdentificatie = "3530"
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 550) {					If InternBreedte < $$$KB800mm 	{ Set TOBIdentificatie = "3530" }
+																						Else 							{ Set TOBIdentificatie = "3560" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 600) {					If InternBreedte < $$$KB550mm 	{ Set TOBIdentificatie = "3530" }
+																						Else 							{ Set TOBIdentificatie = "3560" }
+			}
+			
 			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 650) {					Set TOBIdentificatie = "3560"
 			}
 			
@@ -72,16 +106,24 @@
 			If ##class(TECH.StringUtils).Equals(LadeDiepte, 270, 300) {					Set TOBIdentificatie = "3130"
 			}
 			
-			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 350, 400, 450, 500) {	If InternBreedte < $$$KB500mm 	{ Set TOBIdentificatie = "3330" }
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 350) {					If InternBreedte < $$$KB450mm 	{ Set TOBIdentificatie = "3330" }
 																						Else 							{ Set TOBIdentificatie = "3530" }
 			}
 			
-			ElseIf##class(TECH.StringUtils).Equals(LadeDiepte, 500, 550) {				Set TOBIdentificatie = "3530"
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 400) {					If InternBreedte < $$$KB400mm 	{ Set TOBIdentificatie = "3330" }
+																						Else 							{ Set TOBIdentificatie = "3530" }
 			}
 			
-			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 650) {					Set TOBIdentificatie = "3560"
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 450, 500) {				Set TOBIdentificatie = "3530"
 			}
 			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 550) {					If InternBreedte < $$$KB550mm 	{ Set TOBIdentificatie = "3530" }
+																						Else 							{ Set TOBIdentificatie = "3560" }
+			}
+			
+			ElseIf ##class(TECH.StringUtils).Equals(LadeDiepte, 600, 650) {				Set TOBIdentificatie = "3560"
+			}
+			
 			Else {
 				Do ..GooiTOBEenheidExceptie("Ongeldige LadeDiepte '"_LadeDiepte_"'.")
 			}