Index: vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71642 -r71649
--- vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71642)
+++ vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
@@ -22,10 +22,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPieceUitOorsprongKetting">
-<FormalSpec>OorsprongKettingString:%String,WelkePiece:%Integer=1,WelkNiveau:%Integer=1</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPieceUitOorsprongKetting",OorsprongKettingString,WelkePiece,WelkNiveau)
+<Method name="GeefTweedePersonality">
+<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefTweedePersonality",OorsprongKettingString,FallBackKlantId)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71642 -r71649
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71642)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
@@ -25,45 +25,54 @@
 <ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
+	
 	If (OorsprongKettingString = "") {
 		Set Personality = ..GeefFallBackPersonality(FallBackKlantId)
 	} Else {
-		Try {	
+		Try {
 			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
-			
-			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting,1),",",1)
-			If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
-				Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-			}
-			Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
+			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting, 1),",", 1)
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
 			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 		}
+		
+		If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
+			Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+		}
+		Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
 	}
 	
 	Quit Personality
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPieceUitOorsprongKetting">
-<FormalSpec>OorsprongKettingString:%String,WelkePiece:%Integer=1,WelkNiveau:%Integer=1</FormalSpec>
-<ReturnType>%String</ReturnType>
+<Method name="GeefTweedePersonality">
+<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
+<ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
-	#dim Piece As %String = ""
-	If $$$Not(OorsprongKettingString = "") {
+	#dim Personality As DOM.common.Personality
+	
+	If (OorsprongKettingString = "") {
+		Set Personality = ..GeefFallBackPersonality(FallBackKlantId)
+	} Else {
 		Try {
 			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
-			Set Piece = $Piece($List(OorsprongKetting, WelkNiveau),",", WelkePiece)
+			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1)
+			
+			If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
+				Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+			}
+			Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
 			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 		}
 	}
 	
-	Quit Piece
+	Quit Personality
 ]]></Implementation>
 </Method>
 
@@ -82,7 +91,7 @@
 		}
 		If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
 			Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleDE())
-		}	
+		}
 	}
 	
 	Quit Personality
Index: vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71642 -r71649
--- vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71642)
+++ vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
@@ -21,6 +21,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVoorlaatsteKlant">
+<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefTweedePersonality">
 <FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>