diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5a7a2c560..77fb3f23e 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -56,19 +56,19 @@
             />
           </div>
         </div>
-        <alert ref="alertInvalidZip" 
-          v-if="displayInvalidZipAlert" 
-          class="my-4" 
-          cmsWidgetName="AlertInvalidZipWidget" 
-          alertClass="alert-danger" 
-          v-bind:isDismissible="false" 
-        />        
+        <alert ref="alertInvalidZip"
+          v-if="displayInvalidZipAlert"
+          class="my-4"
+          cmsWidgetName="AlertInvalidZipWidget"
+          alertClass="alert-danger"
+          v-bind:isDismissible="false"
+        />
         <alert
           class="my-4"
           :manualHeadline="AlertPerfectMatchInsuranceVerifiedHeader"
           :manualCopy="AlertPerfectMatchInsuranceVerifiedBody"
           v-model="customAlertData"
-          v-if="vinPopulatedOnPageLoad && isInsuranceVerified" 
+          v-if="vinPopulatedOnPageLoad && isInsuranceVerified"
           alertClass="alert-success"
         />
         <alert
@@ -173,7 +173,7 @@ export default {
     return {
       vin: this.getVinFromStore(),
       serviceZipCode: this.getZipFromStore(),
-      emailAddress: this.getEmailFromStore(),      
+      emailAddress: this.getEmailFromStore(),
       isCarIdDifferent: false,
       customAlertData: {},
       previouslyEnteredCarId: '',
@@ -198,7 +198,7 @@ export default {
     getZipFromStore(){
       return this.$store.getters.order.serviceLocation.zipCode;
     },
-    attachCustomEvents() { 
+    attachCustomEvents() {
       this.prependActionToMethod(this, this.forwardButtonAction, () => {
         this.pushEventToGA(
           this.$route.query[this.queryStrings.FMG_PAGE],
@@ -243,9 +243,9 @@ export default {
         if (this.serviceZipCode && !isZipValid) {
           this.displayInvalidZipAlert = true;
           return this.$refs.funnelFooter.removeLoader();
-        } 
+        }
         this.displayInvalidZipAlert = false;
-        
+
         // If either lookup fails, remove the loader and stop processing the page.
         if (!resultMap.vehicleLookupResponse || !resultMap.serviceZipValidationResponse.isServiceable) {
           // If the vehicle result is undefined, the vin entered was invalid.
@@ -270,7 +270,7 @@ export default {
           this.previouslyEnteredCarId = resultMap.vehicleLookupResponse.carId;
           this.customAlertData.vehicleInfo = resultMap.vehicleLookupResponse;
           this.displayMatchedDifferentVehicleAlert = true;
-          
+
           this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(resultMap.vehicleLookupResponse.carId);
 
           // Update button "Continue with..."
@@ -292,12 +292,12 @@ export default {
           }, false);
 
         return await this.navigateForward();
-        
+
       }
 
       // If a VIN has already been found. Validate the Service Zip (in case of changes)
       const zipValidationResponse = await this.dispatchStoreAction(storeActions.VALIDATE_ZIP, {zip: this.serviceZipCode});
-      
+
       // Check if Service Zip entered is serviceable
       if (zipValidationResponse.data.isServiceable) {
         // If the Service Zip entered is serviceable then save the Zip Info and Email Address and navigate forward
@@ -330,12 +330,12 @@ export default {
       return this.$refs.funnelFooter.removeLoader();
     },
     async navigateForward(){
-      if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
-          this.$router.navigate(this.navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS, this.$route, {}, { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true });
-      } else {
-          await this.navigateForwardWithSingleCarMatch();
-      }
-
+      this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {});
+        if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
+            this.$router.navigate(this.navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS, this.$route, {}, { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true });
+        } else {
+            await this.navigateForwardWithSingleCarMatch();
+        }
     },
   },
   mounted() {
@@ -379,8 +379,8 @@ export default {
       }
       else {
         return 'XXXXXXXXXXXXXXXXX';
-      }    
-    }, 
+      }
+    },
   },
   watch: {
     vin() {
@@ -397,10 +397,10 @@ export default {
     vehicleBanner,
     funnelSubHeader,
     textboxQuestion,
-    alert,   
+    alert,
     vinInformation,
     loadingModal,
-    Form,    
+    Form,
   },
 };
 </script>
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 127561bd2..da76e73cc 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -114,12 +114,13 @@ const routingTable = [
       },
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        //destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        destinationFmgPageValue: fmgPageValues.QUOTE,
       },
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      }
+      },
     ],
   },
   {
@@ -178,7 +179,7 @@ const routingTable = [
       {
         scenario: navigationScenarios.CLICKED_FORWARD,
         destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },   
+      },
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
         destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
@@ -186,11 +187,7 @@ const routingTable = [
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE
-      }           
+      }
     ],
   },
   {
@@ -233,4 +230,4 @@ const routingTable = [
   },
 ];
 
-export { routingTable };
\ No newline at end of file
+export { routingTable };