diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 409039bdc..c596a4078 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -105,6 +105,7 @@ import { errorMessages } from "@/constants/error-messages";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
+import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("zip-required", required(errorMessages.ZIP_REQUIRED));
@@ -228,29 +229,27 @@ export default {
         this.matchedDifferentVehicle = true;
         return;
       };
-      //const carInfo = this.vinDoesNotMatchCarId ? vehicleLookup.data : store.getters.vehicle;
-      //this.updateStore(carInfo)
-      // const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction(
-      //   this.storeActions.GET_PARTS_OR_QUESTIONS,
-      //   {
-      //     carId: store.getters.vehicle.carId,
-      //     glassArray: store.getters.damage.glassToReplace,
-      //     zipCode: this.zip,
-      //     vin: vehicleLookup.vin
-      //   },
-      //   false
-      // );
-      // this.navigateForward(partsData);
+      this.updateStore(vehicleLookup)
+      const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction(
+        this.storeActions.GET_PARTS_OR_QUESTIONS,
+        {
+          carId: vehicleLookup.data.carId,
+          glassArray: this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle ? [] : store.getters.damage.glassToReplace,
+          zipCode: this.zip,
+          vin: vehicleLookup.vin
+        },
+        false
+      );
+      console.log(vehicleLookup.data);
+      this.navigateForward(partsData);
     },
     navigateForward(partsData){
-        if(partsData.data.partsOrQuestions[0].partQuestions && partsData.data.partsOrQuestions[0].partQuestions.length > 0){
-            this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_PARTS_QUESTION, this.$route, {}, {}, partsData.data);
+        if(this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle){
+            this.$router.navigateAfterSave(this.navigationScenarios.CLICKED_FORWARD, this.$route, {}, { displayVehicleChangeAlert: true }, partsData.data);
             return;
-        } else if((!partsData.data.partsOrQuestions[0].partQuestions || partsData.data.partsOrQuestions[0].partQuestions.length < 1) && partsData.data.partsOrQuestions[0].parts.length > 1) {
-           this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_MULTIPLE_PARTS, this.$route, {}, {}, partsData.data);
-           return;
         } else {
-            this.$router.navigate(this.navigationScenarios.CONTINUING_WITH_SINGLE_PART, this.$route);
+            navigateAfterSaveToHeritageFunnel(this.$route);
+            return;
         }
     },
     validateZip(zip) {
@@ -278,7 +277,7 @@ export default {
       store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, carInfo.category);
       store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, carInfo.imageUrl);
       store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, carInfo.imageVifNumber);
-      store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, carInfo.imageColor);
+      store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, carInfo.imageVifNumber);
       store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, this.zip);
       store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email);
     },
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 999bc1184..c2611cfe2 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -67,7 +67,7 @@ const routingTable = [
       },
       {
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
       },
       {
         scenario: navigationScenarios.SELECTED_DAMAGE_WITH_PART_QUESTIONS,
@@ -120,6 +120,10 @@ const routingTable = [
         scenario: navigationScenarios.VIN_LOOKUP,
         destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
       },
+      {
+        scenario: navigationScenarios.CLICKED_FORWARD,
+        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+      }
     ],
   },
   {