diff --git a/app/src/modules/builder/IntialLoad/loadInitialFloorItems.ts b/app/src/modules/builder/IntialLoad/loadInitialFloorItems.ts
index ee5c283..9f71945 100644
--- a/app/src/modules/builder/IntialLoad/loadInitialFloorItems.ts
+++ b/app/src/modules/builder/IntialLoad/loadInitialFloorItems.ts
@@ -282,8 +282,8 @@ function processLoadedModel(
                             actionName: "Action 1",
                             actionType: "pickAndPlace",
                             process: {
-                                startPoint: [0, 0, 0],
-                                endPoint: [0, 0, 0]
+                                startPoint: null,
+                                endPoint: null
                             },
                             triggers: []
                         }
diff --git a/app/src/modules/builder/geomentries/assets/assetManager.ts b/app/src/modules/builder/geomentries/assets/assetManager.ts
index 5f7798e..b632626 100644
--- a/app/src/modules/builder/geomentries/assets/assetManager.ts
+++ b/app/src/modules/builder/geomentries/assets/assetManager.ts
@@ -121,7 +121,8 @@ export default async function assetManager(
 
             const model = gltf;
             model.uuid = item.modelUuid;
-            model.userData = { name: item.modelName, modelId: item.modelfileID, modelUuid: item.modelUuid };
+            console.log('item: ', item);
+            model.userData = { name: item.modelName, modelId: item.modelfileID, modelUuid: item.modelUuid, eventData: item.eventData };
             model.scale.set(...CONSTANTS.assetConfig.defaultScaleBeforeGsap);
             model.position.set(...item.position);
             model.rotation.set(item.rotation.x, item.rotation.y, item.rotation.z);
diff --git a/app/src/modules/scene/controls/selectionControls/moveControls.tsx b/app/src/modules/scene/controls/selectionControls/moveControls.tsx
index cc9ce50..3084952 100644
--- a/app/src/modules/scene/controls/selectionControls/moveControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/moveControls.tsx
@@ -222,6 +222,8 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje
                                 event
                             );
                         }
+
+                        newFloorItem.eventData = eventData;
                     }
                 }
 
diff --git a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
index 7ea7045..58dab0c 100644
--- a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
+++ b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx
@@ -222,6 +222,8 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo
                                 event
                             );
                         }
+                        
+                        newFloorItem.eventData = eventData;
                     }
                 }
 
diff --git a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
index d4b7eaa..4fd5860 100644
--- a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
@@ -146,8 +146,8 @@ function RoboticArmInstance({ armBot }: { armBot: ArmBotStatus }) {
                 logStatus(armBot.modelUuid, "Waiting to trigger CurrentAction")
                 const timeoutId = setTimeout(() => {
                     let actionId=armBot.point.actions[0].actionUuid
-                    // addCurrentAction(armBot.modelUuid,actionId);
-                    addCurrentAction(armBot.modelUuid, selectedAction?.actionId);
+                    addCurrentAction(armBot.modelUuid,actionId);
+                    // addCurrentAction(armBot.modelUuid, selectedAction?.actionId);
                 }, 3000);
                 return () => clearTimeout(timeoutId);
             }
diff --git a/app/src/modules/simulation/roboticArm/roboticArm.tsx b/app/src/modules/simulation/roboticArm/roboticArm.tsx
index e4f2355..528b0bd 100644
--- a/app/src/modules/simulation/roboticArm/roboticArm.tsx
+++ b/app/src/modules/simulation/roboticArm/roboticArm.tsx
@@ -8,8 +8,8 @@ import { usePlayButtonStore } from "../../../store/usePlayButtonStore";
 import ArmBotUI from "../ui/arm/armBotUI";
 
 function RoboticArm() {
-    const { armBots, addArmBot, removeArmBot } = useArmBotStore();
-    const { getProductById } = useProductStore();
+    const { armBots, addArmBot, clearArmBots } = useArmBotStore();
+    const { products, getProductById } = useProductStore();
     const { selectedProduct } = useSelectedProduct();
     const { selectedEventSphere } = useSelectedEventSphere();
     const { selectedEventData } = useSelectedEventData();
@@ -161,20 +161,15 @@ function RoboticArm() {
         if (selectedProduct.productId) {
             const product = getProductById(selectedProduct.productId);
             if (product) {
+                clearArmBots();
                 product.eventDatas.forEach(events => {
                     if (events.type === 'roboticArm') {
-                        removeArmBot(events.modelUuid);
                         addArmBot(selectedProduct.productId, events);
                     }
                 });
             }
         }
-    }, [selectedProduct]);
-
-    // useEffect(()=>{
-    //     // removeArmBot("123", armBotStatusSample[0]);
-    //     addArmBot("123", armBotStatusSample[0]);
-    // },[])
+    }, [selectedProduct, products]);
 
     useEffect(() => {
 
diff --git a/app/src/modules/simulation/simulation.tsx b/app/src/modules/simulation/simulation.tsx
index 757a9ef..efacd53 100644
--- a/app/src/modules/simulation/simulation.tsx
+++ b/app/src/modules/simulation/simulation.tsx
@@ -29,14 +29,14 @@ function Simulation() {
     return (
         <>
 
+            <Products />
+
             {activeModule === 'simulation' &&
 
                 <>
 
                     <Points />
 
-                    <Products />
-
                     <Materials />
 
                     <Trigger />