diff --git a/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts b/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
index f5bfe8e..9e3a766 100644
--- a/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
+++ b/app/src/modules/simulation/triggers/triggerHandler/useTriggerHandler.ts
@@ -283,12 +283,64 @@ export function useTriggerHandler() {
 
                         if (action && action.triggers.length > 0 &&
                             action.triggers[0].triggeredAsset?.triggeredModel.modelUuid &&
+                            action.triggers[0].triggeredAsset?.triggeredAction?.actionUuid &&
                             action.triggers[0].triggeredAsset?.triggeredPoint?.pointUuid) {
-                            setNextLocation(material.materialId, {
-                                modelUuid: action.triggers[0].triggeredAsset?.triggeredModel.modelUuid,
-                                pointUuid: action.triggers[0].triggeredAsset?.triggeredPoint?.pointUuid,
-                            })
-                            handleAction(action, material.materialId);
+                            const model = getEventByModelUuid(selectedProduct.productId, action.triggers[0].triggeredAsset?.triggeredModel.modelUuid);
+
+                            if (model?.type === 'roboticArm') {
+
+                                handleAction(action, material.materialId);
+
+                            } else if (model?.type === 'vehicle') {
+                                const nextAction = getActionByUuid(selectedProduct.productId, action.triggers[0].triggeredAsset?.triggeredAction.actionUuid);
+
+                                if (action) {
+                                    handleAction(action, material.materialId);
+
+                                    const vehicle = getVehicleById(trigger.triggeredAsset?.triggeredModel.modelUuid);
+
+                                    setPreviousLocation(material.materialId, {
+                                        modelUuid: material.current.modelUuid,
+                                        pointUuid: material.current.pointUuid,
+                                        actionUuid: material.current.actionUuid,
+                                    })
+
+                                    setCurrentLocation(material.materialId, {
+                                        modelUuid: trigger.triggeredAsset?.triggeredModel.modelUuid,
+                                        pointUuid: trigger.triggeredAsset?.triggeredPoint?.pointUuid,
+                                        actionUuid: trigger.triggeredAsset?.triggeredAction?.actionUuid,
+                                    });
+
+                                    setNextLocation(material.materialId, null);
+
+                                    if (nextAction) {
+
+                                        if (vehicle) {
+
+                                            if (vehicle.isActive === false && vehicle.state === 'idle' && vehicle.currentLoad < vehicle.point.action.loadCapacity) {
+
+                                                setIsVisible(materialId, false);
+
+                                                // Handle current action from vehicle
+                                                handleAction(nextAction, materialId);
+
+                                            } else {
+
+                                                // Event Manager Needed
+
+                                            }
+                                        }
+                                    }
+                                }
+
+                            } else {
+                                setNextLocation(material.materialId, {
+                                    modelUuid: action.triggers[0].triggeredAsset?.triggeredModel.modelUuid,
+                                    pointUuid: action.triggers[0].triggeredAsset?.triggeredPoint?.pointUuid,
+                                })
+
+                                handleAction(action, material.materialId);
+                            }
                         }
 
                     }