diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 91e09af93..c2f1c0d57 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -175,15 +175,19 @@ export default {
             return this.lineItemUtilities.getArrayOfAllLineItems(this.lineItems);
         },
         flattenedLineItems() {
-            return this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(this.allLineItems);
+            return this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(
+                this.allLineItems
+            );
         },
         frontWipersCartItem() {
             let cartItem = null;
-            let frontWipers = this.vaps.filter(vapsLineItem => vapsLineItem.partType == "FRONT WIPER");
+            let frontWipers = this.vaps.filter(
+                (vapsLineItem) => vapsLineItem.partType == "FRONT WIPER"
+            );
             if (frontWipers.length > 0) {
                 cartItem = {
                     name: "Front Wipers", // TODO: Get from CMS
-                    partNumber: "Multiple", 
+                    partNumber: "Multiple",
                     partType: "Multiple", // TODO: Get from CMS
                     laborAmount: 0,
                     sellingPrice: 0,
@@ -196,7 +200,7 @@ export default {
                     cartItem.laborAmount += lineItem.laborAmount ?? 0;
                     cartItem.sellingPrice += lineItem.sellingPrice ?? 0;
                     cartItem.salesTax += lineItem.salesTax ?? 0;
-                });          
+                });
             }
 
             return cartItem;
@@ -204,11 +208,13 @@ export default {
         rearWipersCartItem() {
             let cartItem = null;
 
-            let rearWipers = this.vaps.filter(vapsLineItem => vapsLineItem.partType == "REAR WIPER");
+            let rearWipers = this.vaps.filter(
+                (vapsLineItem) => vapsLineItem.partType == "REAR WIPER"
+            );
             if (rearWipers.length > 0) {
                 cartItem = {
                     name: "Rear Wipers", // TODO: Get from CMS
-                    partNumber: "Multiple", 
+                    partNumber: "Multiple",
                     partType: "Multiple", // TODO: Get from CMS
                     laborAmount: 0,
                     sellingPrice: 0,
@@ -220,8 +226,8 @@ export default {
                     cartItem.kitPrice += lineItem.kitPrice ?? 0;
                     cartItem.laborAmount += lineItem.laborAmount ?? 0;
                     cartItem.sellingPrice += lineItem.sellingPrice ?? 0;
-                    cartItem.salesTax += lineItem.salesTax ?? 0; 
-                });           
+                    cartItem.salesTax += lineItem.salesTax ?? 0;
+                });
             }
 
             return cartItem;
@@ -237,27 +243,36 @@ export default {
                 if (this.rearWipersCartItem) {
                     cartItems.push(this.rearWipersCartItem);
                 }
- 
-                const otherVapsLineItems = this.vaps.filter(vapsLineItem => vapsLineItem.partType != "FRONT WIPER" && vapsLineItem.partType != "REAR WIPER");
+
+                const otherVapsLineItems = this.vaps.filter(
+                    (vapsLineItem) =>
+                        vapsLineItem.partType != "FRONT WIPER" &&
+                        vapsLineItem.partType != "REAR WIPER"
+                );
                 otherVapsLineItems.forEach((lineItem) => {
                     const cartItem = lineItem;
-                    cartItems.push(cartItem);   
+                    cartItems.push(cartItem);
                 });
-                console.log(this.lineItems)
-                console.log(this.lineItems.glassParts)
-                const glassPartsLineItems = this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(this.lineItems.glassParts);
-                console.log(this.glassPartsLineItems)
+
+                console.log(this.lineItems);
+                console.log(this.lineItems.glassParts);
+
+                const glassPartsLineItems =
+                    this.lineItemUtilities.getFlattenedArrayOfLineItemsWithChildParts(
+                        this.lineItems.glassParts
+                    );
+
+                console.log(this.glassPartsLineItems);
                 glassPartsLineItems.forEach((lineItem) => {
                     const cartItem = lineItem;
-                    cartItems.push(cartItem);   
+                    cartItems.push(cartItem);
                 });
 
-                console.log(cartItems)
+                console.log(cartItems);
+                
                 return cartItems;
             },
-            set: function (newValue) {
-
-            },
+            set: function (newValue) {},
         },
         packageLineItems() {
             const packageLineItems = [];
@@ -306,7 +321,7 @@ export default {
                 return;
             }
             return this.damage.isRepair;
-        },     
+        },
         vaps() {
             const vaps = this.lineItems?.vaps;
             return vaps?.length > 0 ? vaps : [];
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index a8e422e41..c47dd253e 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -27,7 +27,7 @@
                     <cart
                         :damage="damageInfo"
                         :availableLineItems="availableLineItems"
-                        :lineItems="taxedLineItems"
+                        :lineItems="lineItems"
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         @cart-remove="cartRemove" />
 
@@ -142,9 +142,9 @@ export default {
 
         const availableLineItems = [
             resultMap.rainDefense,
-            ... resultMap.supportingItems,
-            ... resultMap.wipers,
-            ... glassParts,
+            ...resultMap.supportingItems,
+            ...resultMap.wipers,
+            ...glassParts,
         ];
 
         const pricingResults = await baseMixin.methods.dispatchStoreActionWithLogging(
diff --git a/src/store/index.js b/src/store/index.js
index c0a8e2685..c0cabc371 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2177,7 +2177,7 @@ export const actions = {
     ) {
         // const flattenedLineItemsWithChildParts =
         //     getFlattenedArrayOfLineItemsWithChildParts(pricedLineItems);
-        
+
         const lineItemsWithOnlyPriceInfo = pricedAvailableLineItems.map((lineItem) => ({
             partNumber: lineItem.partNumber,
             laborAmount: lineItem.laborAmount ?? 0,
@@ -2219,7 +2219,7 @@ export const actions = {
         //         storeLineItems[key] = pricedLineItem;
         //     }
         // });
-        
+
         // console.log(pricedLineItems)
 
         pricedAvailableLineItems = addTaxesToPricedLineItems(
@@ -2564,7 +2564,8 @@ function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) {
 export class LineItemUtilities {
     constructor() {
         this.getArrayOfAllLineItems = getArrayOfAllLineItems;
-        this.getFlattenedArrayOfLineItemsWithChildParts = getFlattenedArrayOfLineItemsWithChildParts;
+        this.getFlattenedArrayOfLineItemsWithChildParts =
+            getFlattenedArrayOfLineItemsWithChildParts;
     }
 }
 
@@ -2572,16 +2573,16 @@ function getArrayOfAllLineItems(lineItems) {
     let consolidatedLineItemsArray = [];
 
     if (lineItems.glassParts != null)
-        consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.glassParts];
+        consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.glassParts];
 
     if (lineItems.supportingItems != null)
-        consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.supportingItems];
+        consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.supportingItems];
 
     if (lineItems.vaps != null)
-        consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.vaps];
+        consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.vaps];
 
     if (lineItems.promos != null)
-        consolidatedLineItemsArray = [... consolidatedLineItemsArray, ... lineItems.promos];
+        consolidatedLineItemsArray = [...consolidatedLineItemsArray, ...lineItems.promos];
 
     return consolidatedLineItemsArray;
 }
@@ -2597,7 +2598,7 @@ function getFlattenedArrayOfLineItemsWithChildParts(lineItems) {
             ];
         }
     });
-    console.log(flattenedArray)
+    console.log(flattenedArray);
     return flattenedArray;
 }