diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 91b0f9b19..d15b06dcb 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -1,5 +1,4 @@
 <template>
-    <!-- TODO: UPDATE -->
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <loadingModal ref="loadingModal" />
         <div class="container-fluid page-container-grouped-styles">
@@ -249,9 +248,6 @@ export default {
         isRepair() {
             return store.getters.damage.isRepair;
         },
-        alertInfo() {
-            return this.skipVinNotRepair ? "AlertQuoteVinOptional" : "AlertQuoteReady";
-        },
     },
     watch: {
         serviceZipCode() {
@@ -263,7 +259,6 @@ export default {
         vehicleBanner,
         funnelSubHeader,
         navbar,
-        buttonQuestion,
         Form,
         alert,
         textboxQuestion,
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index ec19c3800..20125506d 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -376,12 +376,12 @@ export default {
                 payment.insuranceCoverage.coverageStatus !== "" &&
                 policy.policyNumber !== "";
 
-            if (vehicleChangedDuringPolicyLookupInHeritage) {
-                const skipVin = await skipVinLookup();
+            const skipVin = await skipVinLookup();
 
+            if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
-                        this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                        this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
                         this.$route
                     );
                 } else {
@@ -406,6 +406,11 @@ export default {
                     this.navigationScenarios.CLICKED_FORWARD_WITH_VIN,
                     this.$route
                 );
+            } else if (skipVin) {
+                this.$router.navigateWithSaving(
+                    this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
+                    this.$route
+                );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index c337276f3..006d5a5e3 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -27,12 +27,16 @@ const routingTable = function (store) {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
                     destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario:
                         navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario:
@@ -216,6 +220,43 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
                     destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.SELECTED_NO_VIN,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SERVICE_ZIP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
@@ -284,7 +325,7 @@ const routingTable = function (store) {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
@@ -309,7 +350,7 @@ const routingTable = function (store) {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
@@ -338,7 +379,7 @@ const routingTable = function (store) {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
@@ -367,7 +408,7 @@ const routingTable = function (store) {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,