diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index a339cad..6985cea 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -1648,58 +1648,39 @@ namespace AyaNova.PlugIn.V8
             progress.SubOp("");
             var ObjectTypeName = "Part Assembly";
             PartAssemblies pa = PartAssemblies.GetItems();
-            string crit = "<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?><GRIDCRITERIA>  <COLUMNITEM CM=\"aPartAssembly.aName\" UI=\"LT_O_PartAssembly\" PIN=\"0\" WIDTH=\"120\" SORT=\"ASC\" />  <COLUMNITEM CM=\"aPart.aPartNumber\" UI=\"LT_Part_Label_PartNumber\" PIN=\"0\" WIDTH=\"111\" />  <COLUMNITEM CM=\"aPart.aName\" UI=\"LT_O_Part\" PIN=\"0\" WIDTH=\"135\" />  <COLUMNITEM CM=\"aManufacturers.aName\" UI=\"LT_Part_Label_ManufacturerID\" PIN=\"0\" WIDTH=\"114\" />  <WHEREITEMGROUP GROUPLOGICALOPERATOR=\"And\" UI=\"LT_O_PartAssembly\">    <WHEREITEM COMPAREOPERATOR=\"NotEquals\" CM=\"aPartAssembly.aName\" UICOMPAREVALUE=\"\" TYPE=\"System.String\" COMPAREVALUE=\"\" />  </WHEREITEMGROUP></GRIDCRITERIA>";
-            PartList pl = PartList.GetList(crit);
 
-            progress.Append("Exporting " + pl.Count.ToString() + " " + ObjectTypeName + " part records");
-            Guid gCurrentPartAssemblyId = Guid.Empty;
-            string sCurrentPartAssemblyName = string.Empty;
-            List<long> partsInAssembly = new List<long>();
-            foreach (PartList.PartListInfo i in pl)
+            progress.Append("Exporting " + pa.Count.ToString() + " " + ObjectTypeName + " part records");
+            foreach (PartAssembly p in pa)
             {
                 if (!progress.KeepGoing) return;
-                //change of assembly in list
-                if (gCurrentPartAssemblyId != i.LT_O_PartAssembly.Value)
-                {                    
-                    if (gCurrentPartAssemblyId != Guid.Empty)
-                    {
-                        foreach (PartAssembly p in pa)
-                        {
-                            if (p.ID == gCurrentPartAssemblyId)
-                            {
-                                //Save the current assembly 
-                                dynamic d = new JObject();
-                                d.name = sCurrentPartAssemblyName;
-                                progress.Op(ObjectTypeName + " " + d.name);
-                                d.active = p.Active;
-                                d.notes = p.Description;
-                                JArray dItems = new JArray();
-                                foreach (long l in partsInAssembly)
-                                {
-                                    dynamic ditem = new JObject();
-                                    ditem.partId = l;
-                                    ditem.partAssemblyId = 0;
-                                    ditem.quantity = 1;
-                                    dItems.Add(ditem);
-                                }
-                                d.items = dItems;
-
-                                List<string> tags = new List<string>();
-                                AddImportTag(tags);
-                                SetTags(d, tags);
-                                var rMainObject = await util.PostAsync("part-assembly", d.ToString());
-                                long RavenId = util.IdFromResponse(rMainObject);
-                                //Event log fixup
-                                await util.EventLog(util.AyaType.Project, RavenId, SafeGetUserMap(p.Creator), SafeGetUserMap(p.Modifier), p.Created, p.Modified);
-                                break;
-                            }//matches passembly list
-                        }//each partassembly to match
-                    }//not empty
-                    partsInAssembly.Clear();
-                    gCurrentPartAssemblyId = i.LT_O_PartAssembly.Value;
-                    sCurrentPartAssemblyName = GetUniqueName(i.LT_O_PartAssembly.Display);
+                string crit = "<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?><GRIDCRITERIA>  <COLUMNITEM CM=\"aPartAssembly.aName\" UI=\"LT_O_PartAssembly\" PIN=\"0\" WIDTH=\"120\" SORT=\"ASC\" />  <COLUMNITEM CM=\"aPart.aPartNumber\" UI=\"LT_Part_Label_PartNumber\" PIN=\"0\" WIDTH=\"111\" />  <COLUMNITEM CM=\"aPart.aName\" UI=\"LT_O_Part\" PIN=\"0\" WIDTH=\"135\" />  <COLUMNITEM CM=\"aManufacturers.aName\" UI=\"LT_Part_Label_ManufacturerID\" PIN=\"0\" WIDTH=\"114\" />  "
+                    + "<WHEREITEMGROUP GROUPLOGICALOPERATOR=\"And\" UI=\"LT_O_PartAssembly\">"
+                    + "<WHEREITEM COMPAREOPERATOR=\"Equals\" CM=\"aPartAssembly.aID\" UICOMPAREVALUE=\"\" TYPE=\"System.Guid\" COMPAREVALUE=\"{" + p.ID.ToString().ToUpperInvariant() + "}\" />  "
+                    + "</WHEREITEMGROUP></GRIDCRITERIA>";
+                PartList pl = PartList.GetList(crit);               
+                dynamic d = new JObject();
+                d.name = GetUniqueName(p.Name);
+                progress.Op(ObjectTypeName + " " + d.name);
+                d.active = p.Active;
+                d.notes = p.Description;
+                JArray dItems = new JArray();
+                foreach (PartList.PartListInfo i in pl)
+                {
+                    dynamic ditem = new JObject();
+                    ditem.partId = Getv7v8IdMap(i.LT_O_Part.Value, "part id for assembly"); 
+                    ditem.partAssemblyId = 0;
+                    ditem.quantity = 1;
+                    dItems.Add(ditem);
                 }
-                partsInAssembly.Add(Getv7v8IdMap(i.LT_O_Part.Value, "part id for assembly"));
+                d.items = dItems;
+
+                List<string> tags = new List<string>();
+                AddImportTag(tags);
+                SetTags(d, tags);
+                var rMainObject = await util.PostAsync("part-assembly", d.ToString());
+                long RavenId = util.IdFromResponse(rMainObject);
+                //Event log fixup
+                await util.EventLog(util.AyaType.Project, RavenId, SafeGetUserMap(p.Creator), SafeGetUserMap(p.Modifier), p.Created, p.Modified);
             }
         }
         #endregion part assemblies