diff --git a/Gremlin/GremlinUI/QuoteUI.xaml.cs b/Gremlin/GremlinUI/QuoteUI.xaml.cs
index 21c0c86..1b67717 100644
--- a/Gremlin/GremlinUI/QuoteUI.xaml.cs
+++ b/Gremlin/GremlinUI/QuoteUI.xaml.cs
@@ -1,7 +1,5 @@
-using DocumentFormat.OpenXml.Drawing.Charts;
-using Gremlin.GremlinData.EntityClasses;
+using Gremlin.GremlinData.EntityClasses;
 using Gremlin.GremlinUI.ViewModels;
-using Gremlin.GremlinUtilities;
 using Gremlin.Operations;
 using Gremlin.ViewModels;
 using System;
diff --git a/Gremlin/GremlinUI/ViewModels/QuoteVM.cs b/Gremlin/GremlinUI/ViewModels/QuoteVM.cs
index 5f95f4b..8b236df 100644
--- a/Gremlin/GremlinUI/ViewModels/QuoteVM.cs
+++ b/Gremlin/GremlinUI/ViewModels/QuoteVM.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace Gremlin.GremlinUI.ViewModels
 {
@@ -70,13 +71,17 @@ namespace Gremlin.GremlinUI.ViewModels
                 totalDiscount += lineItemVM.TotalDiscount;
                 totalNet += lineItemVM.TotalNet;
 
-                if (lineItemVM.ProductLine == "RB")
+                switch (lineItemVM.ProductLine)
                 {
-                    quoteContainsRB = true;
+                    case "RB":
+                        quoteContainsRB = true; break;
+                    case "3PP":
+                        quoteContains3PP = true; break;
                 }
-                else if (lineItemVM.ProductLine == "3PP")
+
+                if (lineItemVM.OptionNumber.StartsWith("8D"))
                 {
-                    quoteContains3PP = true;
+                    quoteVM.Warranty = int.Parse(lineItemVM.OptionNumber.Last().ToString()) * 12;
                 }
 
                 quoteVM.LineItemsVM.Add(lineItemVM);