diff --git a/ExportDXF/ExportDXF.csproj b/ExportDXF/ExportDXF.csproj
index ee669e0..5a56240 100644
--- a/ExportDXF/ExportDXF.csproj
+++ b/ExportDXF/ExportDXF.csproj
@@ -22,7 +22,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>12</ApplicationRevision>
+    <ApplicationRevision>15</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs
index 5c6d4a8..2a4643c 100644
--- a/ExportDXF/Forms/MainForm.cs
+++ b/ExportDXF/Forms/MainForm.cs
@@ -206,25 +206,25 @@ namespace ExportDXF.Forms
             Print("Found " + bomTables.Count);
             Print("");
 
+			var items = new List<Item>();
+
             foreach (var bom in bomTables)
             {
                 if (worker.CancellationPending)
                     return;
 
                 Print(bom.BomFeature.Name);
-
                 Print("Fetching components...");
-
-                var items = GetItems(bom);
-
 				Print("Found " + items.Count);
-                Print("");
 
-                ExportToDXF(items);
+				items.AddRange(GetItems(bom));
             }
-        }
 
-        private void ExportToDXF(PartDoc part)
+			Print("Found " + items.Count + " total");
+			ExportToDXF(items);
+		}
+
+		private void ExportToDXF(PartDoc part)
         {
             var prefix = textBox2.Text;
             var model = part as ModelDoc2;
@@ -579,6 +579,7 @@ namespace ExportDXF.Forms
 
                 list.Add(new Item
                 {
+					ItemNo = name,
                     PartNo = name,
                     Quantity = group.Count(),
                     Component = component