diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json
index b3c5f70c..35ffe25f 100644
--- a/ayanova/package-lock.json
+++ b/ayanova/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ayanova",
-  "version": "8.0.0-beta.6",
+  "version": "8.0.0-rc.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ayanova",
-      "version": "8.0.0-beta.6",
+      "version": "8.0.0-rc.1",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.3.0",
         "@fortawesome/free-regular-svg-icons": "^5.15.4",
diff --git a/ayanova/package.json b/ayanova/package.json
index 4283f117..9f2cbbb1 100644
--- a/ayanova/package.json
+++ b/ayanova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ayanova",
-  "version": "8.0.0-beta.6",
+  "version": "8.0.0-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js
index 290c9490..a16da681 100644
--- a/ayanova/src/api/ayanova-version.js
+++ b/ayanova/src/api/ayanova-version.js
@@ -1,4 +1,4 @@
 export default {
-  version: "8.0.0-beta.6",
+  version: "8.0.0-rc.1",
   copyright: "© 1999-2022, Ground Zero Tech-Works Inc."
 };
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index 05845b9d..ea5ab76e 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -921,7 +921,7 @@ async function fetchTranslatedText() {
     "LoanUnitRateMonthCost",
     "LoanUnitRateWeekCost",
     "LoanUnitRateYearCost",
-    "LoanUnitDefaultRate",
+    //"LoanUnitDefaultRate",
     "LoanUnitShadowUnit",
     "LoanUnitCustom1",
     "LoanUnitCustom2",
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index ea402f02..560cb83a 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -93,7 +93,10 @@
           </v-col>
 
           <v-col
-            v-if="form().showMe(this, 'UnitModelDiscontinuedDate')"
+            v-if="
+              form().showMe(this, 'UnitModelDiscontinuedDate') &&
+                obj.discontinued == true
+            "
             cols="12"
             sm="6"
             lg="4"
@@ -129,7 +132,10 @@
           </v-col>
 
           <v-col
-            v-if="form().showMe(this, 'UnitModelWarrantyLength')"
+            v-if="
+              form().showMe(this, 'UnitModelWarrantyLength') &&
+                obj.lifeTimeWarranty == false
+            "
             cols="12"
             sm="6"
             lg="4"