diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index c2cf9f09..b4c0e87f 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -167,7 +167,7 @@
             :form-key="formCustomTemplateKey"
             :readonly="formState.readOnly"
             :parent-v-m="this"
-            key-start-with="Items.WorkOrderItemUnitCustom"
+            key-start-with="WorkOrderItemUnitCustom"
             :ref="
               `Items[${activeWoItemIndex}].units[
               ${activeItemIndex}
@@ -300,15 +300,10 @@ export default {
     }
   },
   methods: {
-    userChange(newName) {
+    unitChange(newName) {
       this.value.items[this.activeWoItemIndex].units[
         this.activeItemIndex
-      ].userViz = newName;
-    },
-    rateChange(newName) {
-      this.value.items[this.activeWoItemIndex].units[
-        this.activeItemIndex
-      ].serviceRateViz = newName;
+      ].unitViz = newName;
     },
     newItem() {
       let newIndex = this.value.items[this.activeWoItemIndex].units.length;
@@ -420,7 +415,7 @@ export default {
 
       if (this.form().showMe(this, "WorkOrderItemUnit")) {
         headers.push({
-          text: this.$ay.t("WorkOrderItemUnit"),
+          text: this.$ay.t("Unit"),
           align: "left",
           value: "unitViz"
         });
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 4215beb7..6f007b02 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -321,7 +321,7 @@
             :form-key="formCustomTemplateKey"
             :readonly="formState.readOnly"
             :parent-v-m="this"
-            key-start-with="Items.WorkOrderItemCustom"
+            key-start-with="WorkOrderItemCustom"
             :ref="`items[${activeItemIndex}].customFields`"
             data-cy="customFields"
             :error-messages="
@@ -360,7 +360,21 @@
                                         GRANDCHILDREN
               ############################################################################ -->
 
-        <!-- //todo WorkOrderItemUnitList here -->
+        <v-col
+          cols="12"
+          v-if="
+            pvm.subRights.scheduledUsers.visible &&
+              form().showMe(this, 'WorkOrderItemUnitList')
+          "
+        >
+          <GzWoItemUnits
+            v-model="value"
+            :pvm="pvm"
+            :active-wo-item-index="activeItemIndex"
+            data-cy="woItemUnits"
+            @change="$emit('change')"
+          />
+        </v-col>
 
         <v-col
           cols="12"
@@ -497,6 +511,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  XXXeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+import GzWoItemUnits from "../components/work-order-item-units.vue";
 import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-users.vue";
 import GzWoItemLabors from "../components/work-order-item-labors.vue";
 import GzWoItemTravels from "../components/work-order-item-travels.vue";
@@ -508,6 +524,7 @@ import GzWoItemLoans from "../components/work-order-item-loans.vue";
 
 export default {
   components: {
+    GzWoItemUnits,
     GzWoItemScheduledUsers,
     GzWoItemExpenses,
     GzWoItemLabors,
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 3eb1c7f3..b0fe1a2d 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1787,7 +1787,23 @@ async function fetchTranslatedText(vm) {
     "WorkOrderItemScheduledUserUserID",
     "WorkOrderItemScheduledUserServiceRateID",
     "Sequence",
-    "WorkOrderItemUnitList",
+
+    "WorkOrderItemCustom1",
+    "WorkOrderItemCustom2",
+    "WorkOrderItemCustom3",
+    "WorkOrderItemCustom4",
+    "WorkOrderItemCustom5",
+    "WorkOrderItemCustom6",
+    "WorkOrderItemCustom7",
+    "WorkOrderItemCustom8",
+    "WorkOrderItemCustom9",
+    "WorkOrderItemCustom10",
+    "WorkOrderItemCustom11",
+    "WorkOrderItemCustom12",
+    "WorkOrderItemCustom13",
+    "WorkOrderItemCustom14",
+    "WorkOrderItemCustom15",
+    "WorkOrderItemCustom16",
     "AddressTypePhysical",
     "AddressTypePostal",
     "AddressCopyToPostal",
@@ -1808,6 +1824,25 @@ async function fetchTranslatedText(vm) {
     "WorkOrderItemStatusList",
     "WorkOrderStatusList",
     "WorkOrderItemPriorityList",
+    "WorkOrderItemUnitList",
+    "WorkOrderItemUnitNotes",
+    "Unit",
+    "WorkOrderItemUnitCustom1",
+    "WorkOrderItemUnitCustom2",
+    "WorkOrderItemUnitCustom3",
+    "WorkOrderItemUnitCustom4",
+    "WorkOrderItemUnitCustom5",
+    "WorkOrderItemUnitCustom6",
+    "WorkOrderItemUnitCustom7",
+    "WorkOrderItemUnitCustom8",
+    "WorkOrderItemUnitCustom9",
+    "WorkOrderItemUnitCustom10",
+    "WorkOrderItemUnitCustom11",
+    "WorkOrderItemUnitCustom12",
+    "WorkOrderItemUnitCustom13",
+    "WorkOrderItemUnitCustom14",
+    "WorkOrderItemUnitCustom15",
+    "WorkOrderItemUnitCustom16",
     "WorkOrderItemExpenseChargeAmount",
     "WorkOrderItemExpenseChargeTaxCodeID",
     "WorkOrderItemExpenseChargeToCustomer",