Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45949 -r45953
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45949)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45953)
@@ -95,7 +95,7 @@
 <FormalSpec>ProductNummer:%Integer</FormalSpec>
 <Implementation><![CDATA[
 	If ($Data(^KPR(ProductNummer))){
-		Set ..ProductNummer = ProductNummer	
+		Set ..ProductNummer = ProductNummer
 		Set ..IsNieuwProduct = 0
 	} Else {
 		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product "_ProductNummer_" bestaat niet!")
@@ -109,14 +109,21 @@
 <Implementation><![CDATA[
 	Do ..Valideer()
 	
+	
+	#dim IsGewijzigdProduct As %Boolean = 0
+	
 	#dim NodeIndex As %String
 	For NodeIndex = 0,1,2,3,15,"I1","J","G" {
-		Do $method($property($this,"Data"_NodeIndex),"Save")
+		Set:IsGewijzigdProduct=0 IsGewijzigdProduct = $method($property($this,"Data"_NodeIndex),"IsGewijzigd")
 	}
-
-	Do BLDIND^PRODUKT2(..ProductNummer) 
 	
-	If ..IsNieuwProduct { Do Gemaakt^PRODUKT2(..ProductNummer) } Else { Do Gewijzigd^PRODUKT2(..ProductNummer) }
+	if IsGewijzigdProduct {
+		For NodeIndex = 0,1,2,3,15,"I1","J","G" {
+			Do $method($property($this,"Data"_NodeIndex),"Save")
+		}	
+		Do BLDIND^PRODUKT2(..ProductNummer)
+		If ..IsNieuwProduct { Do Gemaakt^PRODUKT2(..ProductNummer) } Else { Do Gewijzigd^PRODUKT2(..ProductNummer) }
+	}
 ]]></Implementation>
 </Method>
 
@@ -686,8 +693,8 @@
 <Implementation><![CDATA[
 	If (i%DataJ = "") {
 		#dim JIndex As %String = "J"_..LeverancierNr
-		If $L(JIndex)<2 set JIndex = $O(^KPR(..ProductNummer,"J"))
-		Set:$length(JIndex)>1 i%DataJ = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex)
+		If $Length(JIndex)<2 Set JIndex = $Order(^KPR(..ProductNummer,"J"))
+		Set:$Length(JIndex)>1 i%DataJ = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex)
 	}
 	Quit i%DataJ
 ]]></Implementation>
@@ -705,6 +712,7 @@
 </Method>
 
 <Method name="Valideer">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set Messages = ##class(%ListOfDataTypes).%New()