diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 3cb99f941..19e190f5f 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -103,6 +103,7 @@
                     class="small mt-4"
                     v-model="lineItems"
                     :addableVaps="availableVaps"
+                    :pageName="pageName"
                     modalWidgetName="PromoModalWidget" />
             </div>
         </div>
@@ -145,6 +146,7 @@ export default {
         damage: Object,
         servicePackageOptionsCmsName: String,
         availableVaps: Object,
+        pageName: String,
         allowItemRemoval: Boolean,
         recyclingModalCmsWidgetName: String,
         showAsPaid: Boolean,
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 6da22c37c..e58dc0a3a 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -129,6 +129,11 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
         heritageParms["forceEndToEndInsurance"] = true;
     }
 
+    // if they are going to heritage and already have a policy number then this is a nav back flow
+    if (store.getters.policy.policyNumber) {
+        heritageParms["insuranceNavBack"] = true;
+    }
+
     router.navigateToExternalUrl(externalUrls.HERITAGE_FUNNEL, heritageParms);
 }
 
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 38f4161b9..07c469ae8 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -166,6 +166,7 @@ async function saveSessionHelper(
             customerPortalLoginToken: savedSessionInfo.data.customerPortalLoginToken,
             lockToken: savedSessionInfo.data.lockToken,
             settledTenderAmount: savedSessionInfo.data.settledTenderAmount,
+            billToAccountNumber: savedSessionInfo.data.billToAccountNumber,
         },
         false
     );
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index e880b1534..4fa86743f 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -119,6 +119,7 @@ export default {
         return {
             searchableInsuranceCompanyList: [],
             originalList: [],
+            selectedParentAccount: "",
         };
     },
     methods: {
@@ -142,8 +143,11 @@ export default {
             // Go back to Quote page
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
-        forwardButtonAction() {
-            this.dispatchStoreAction(
+        async forwardButtonAction() {
+            // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
+            await store.getters.applicationUser.saveSessionPromise;
+
+            await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
                 this.selectedParentAccount,
                 false
@@ -156,12 +160,12 @@ export default {
             });
         },
         selectParentAccountNumber(parentAccountName) {
-            if (!this.insuranceCompanyList) {
+            if (!this.searchableInsuranceCompanyList) {
                 console.error("No insurance companies found");
                 return;
             }
 
-            var selectedItem = this.insuranceCompanyList.filter((item) => {
+            var selectedItem = this.searchableInsuranceCompanyList.filter((item) => {
                 return item.accountName === parentAccountName;
             });
 
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 6d233a797..207b7f041 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -26,6 +26,7 @@
                         :availableVaps="availableVaps"
                         :allowItemRemoval="true"
                         v-model="lineItems"
+                        pageName="payment-method"
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         recyclingModalCmsWidgetName="RecycleModal" />
 
diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index 6eb8a5a87..09d9ddc15 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -29,6 +29,8 @@
 <script>
 import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
 import baseMixin from "@/mixins/base-mixin.js";
+import { getPromosThatMatchLineItemsOnOrder } from "@/helpers/promotions-helper";
+import { getArrayOfAllLineItems } from "@/store";
 
 const INLINE_IMAGE_TOKEN = "custom:inlineImage";
 const AFTERPAY_PRICE_TOKEN = "custom:afterpayPrice";
@@ -50,7 +52,9 @@ export default {
     name: "afterpay-modal-banner",
     props: {
         cmsWidgetName: String,
+        availableLineItems: Array,
         lineItems: Array,
+        activePromos: null,
     },
     data() {
         return {};
@@ -62,7 +66,7 @@ export default {
     },
     computed: {
         nullSafeLineItems() {
-            return this.lineItems ?? [];
+            return this.availableLineItems ?? [];
         },
         imageUrl() {
             return this.getCmsContent(this.cmsWidgetName, "Image");
@@ -77,10 +81,23 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
         },
         afterpayPrice() {
-            const price = baseMixin.methods.getTierOnePackagePrice(
+            let price = baseMixin.methods.getTierOnePackagePrice(
                 baseMixin.methods.filterOutFees(this.nullSafeLineItems)
             );
 
+            let vapsLineItemsForSelectedPackage = this.lineItems.vaps;
+            vapsLineItemsForSelectedPackage.forEach((lineItem) => {
+                price += baseMixin.methods.getTotalLineItemPrice(lineItem);
+            });
+
+            if (this.activePromos) {
+                let allLineItems = getArrayOfAllLineItems(this.lineItems);
+                const promos = getPromosThatMatchLineItemsOnOrder(this.activePromos, allLineItems);
+                promos.forEach((promo) => {
+                    price += baseMixin.methods.getTotalLineItemPrice(promo);
+                });
+            }
+
             const adjusted = (price / 4).toFixed(2);
 
             return `$${adjusted}`;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 96123b03a..002c679f5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -37,7 +37,9 @@
                     <afterpayModalBanner
                         v-if="!isInsuranceSelected"
                         cmsWidgetName="AfterpayModalWidget"
-                        :lineItems="availableLineItems" />
+                        :activePromos="lineItems.promos"
+                        :availableLineItems="availableLineItems"
+                        :lineItems="lineItems" />
 
                     <promoModalQuestion
                         class="small mt-4"
diff --git a/src/store/index.js b/src/store/index.js
index 4fe96703e..9eed3a840 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1069,6 +1069,7 @@ export const actions = {
             customerPortalLoginToken,
             lockToken,
             settledTenderAmount,
+            billToAccountNumber,
         }
     ) {
         context.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
@@ -1084,6 +1085,7 @@ export const actions = {
         context.commit(storeMutations.LOCK_TOKEN, lockToken);
         context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
         context.commit(storeMutations.UPDATE_SETTLED_TENDER_AMOUNT, settledTenderAmount);
+        context.commit(storeMutations.UPDATE_BILL_TO_ACCT_NUMBER, billToAccountNumber);
     },
 
     logPageView(
@@ -2827,7 +2829,7 @@ export function mapTaxedLineItemsToStoreFormat(availableLineItems, storeLineItem
     return lineItems;
 }
 
-function getArrayOfAllLineItems(lineItems) {
+export function getArrayOfAllLineItems(lineItems) {
     let consolidatedLineItemsArray = [];
 
     if (lineItems.glassParts != null)