diff --git a/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte b/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
index 2826a8ea..b72a4b17 100644
--- a/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
+++ b/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
@@ -13,7 +13,7 @@
 
 	import '@xyflow/svelte/dist/style.css';
 
-	const nodes = writable([
+	const nodes = writable<Node[]>([
 		{
 			id: '1',
 			type: 'input',
@@ -55,8 +55,6 @@
 	const onDragOver = (event: DragEvent) => {
 		event.preventDefault();
 
-		console.log(event);
-
 		if (event.dataTransfer) {
 			event.dataTransfer.dropEffect = 'move';
 		}
@@ -81,7 +79,8 @@
 			data: { label: `${type} node` }
 		};
 
-		nodes.update((nds) => nds.concat(newNode));
+		$nodes.push(newNode);
+		$nodes = $nodes;
 	};
 
 	$: {
diff --git a/examples/svelte/src/routes/examples/intersections/Flow.svelte b/examples/svelte/src/routes/examples/intersections/Flow.svelte
index f3f80335..12c98e00 100644
--- a/examples/svelte/src/routes/examples/intersections/Flow.svelte
+++ b/examples/svelte/src/routes/examples/intersections/Flow.svelte
@@ -12,8 +12,8 @@
 
 	const { getIntersectingNodes } = useSvelteFlow();
 
-	function onNodeDrag({ detail: { node } }) {
-		const intersections = getIntersectingNodes(node).map((n) => n.id);
+	function onNodeDrag({ detail: { targetNode } }) {
+		const intersections = getIntersectingNodes(targetNode).map((n) => n.id);
 
 		$nodes.forEach((n) => {
 			n.class = intersections.includes(n.id) ? 'highlight' : '';
diff --git a/examples/svelte/src/routes/examples/intersections/nodes-and-edges.ts b/examples/svelte/src/routes/examples/intersections/nodes-and-edges.ts
index fffb59b8..7b094ce2 100644
--- a/examples/svelte/src/routes/examples/intersections/nodes-and-edges.ts
+++ b/examples/svelte/src/routes/examples/intersections/nodes-and-edges.ts
@@ -1,28 +1,28 @@
 import type { Node, Edge } from '@xyflow/svelte';
 
 export const initialNodes: Node[] = [
-  {
-    id: '1',
-    data: { label: 'Node 1' },
-    position: { x: 0, y: 0 },
-    style: 'width: 200px; height: 100px;'
-  },
-  {
-    id: '2',
-    data: { label: 'Node 2' },
-    position: { x: 0, y: 150 }
-  },
-  {
-    id: '3',
-    data: { label: 'Node 3' },
-    position: { x: 250, y: 0 }
-  },
-  {
-    id: '4',
-    data: { label: 'Node' },
-    position: { x: 350, y: 150 },
-    style: 'width: 50px; height: 50px;'
-  }
+	{
+		id: '1',
+		data: { label: 'Node 1' },
+		position: { x: 0, y: 0 },
+		style: 'width: 200px; height: 100px;'
+	},
+	{
+		id: '2',
+		data: { label: 'Node 2' },
+		position: { x: 0, y: 150 }
+	},
+	{
+		id: '3',
+		data: { label: 'Node 3' },
+		position: { x: 250, y: 0 }
+	},
+	{
+		id: '4',
+		data: { label: 'Node' },
+		position: { x: 350, y: 150 },
+		style: 'width: 50px; height: 50px;'
+	}
 ];
 
 export const initialEdges: Edge[] = [];
diff --git a/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
index d5955501..436d2109 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
@@ -11,6 +11,7 @@
 	type $$Props = NodeProps;
 
 	export let id: $$Props['id'];
+	$$restProps;
 
 	const connections = useHandleConnections({
 		nodeId: id,
diff --git a/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
index c1642da2..1fe5ff70 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
@@ -7,6 +7,7 @@
 	export let data: $$Props['data'];
 
 	const { updateNodeData } = useSvelteFlow();
+	$$restProps;
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
index be15ac9a..55960cb5 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
@@ -12,6 +12,8 @@
 	type $$Props = NodeProps;
 
 	export let id: $$Props['id'];
+	export let data: $$Props['data'];
+	$$restProps;
 
 	const { updateNodeData } = useSvelteFlow();
 	const connections = useHandleConnections({
@@ -22,8 +24,12 @@
 	$: nodeData = useNodesData<MyNode>($connections[0]?.source);
 	$: textNode = isTextNode($nodeData) ? $nodeData : null;
 
+	$: console.log(textNode?.data, data);
+
 	$: {
-		updateNodeData(id, { text: textNode?.data.text.toUpperCase() || '' });
+		const input = textNode?.data.text.toUpperCase() ?? '';
+		updateNodeData(id, { text: input });
+		console.log('updatedNodeData with', input);
 	}
 </script>
 
diff --git a/packages/react/src/additional-components/NodeToolbar/NodeToolbar.tsx b/packages/react/src/additional-components/NodeToolbar/NodeToolbar.tsx
index 1fc6f25c..f14f822e 100644
--- a/packages/react/src/additional-components/NodeToolbar/NodeToolbar.tsx
+++ b/packages/react/src/additional-components/NodeToolbar/NodeToolbar.tsx
@@ -74,7 +74,7 @@ export function NodeToolbar({
   }
 
   const nodeRect: Rect = getNodesBounds(nodes, { nodeOrigin });
-  const zIndex: number = Math.max(...nodes.map((node) => (node.internals?.z || 1) + 1));
+  const zIndex: number = Math.max(...nodes.map((node) => node.internals.z + 1));
 
   const wrapperStyle: CSSProperties = {
     position: 'absolute',
diff --git a/packages/react/src/components/ConnectionLine/index.tsx b/packages/react/src/components/ConnectionLine/index.tsx
index 54b3f24d..4ca5c106 100644
--- a/packages/react/src/components/ConnectionLine/index.tsx
+++ b/packages/react/src/components/ConnectionLine/index.tsx
@@ -52,7 +52,7 @@ const ConnectionLine = ({
     ),
     shallow
   );
-  const fromHandleBounds = fromNode?.internals?.handleBounds;
+  const fromHandleBounds = fromNode?.internals.handleBounds;
   let handleBounds = fromHandleBounds?.[handleType];
 
   if (connectionMode === ConnectionMode.Loose) {
@@ -66,8 +66,8 @@ const ConnectionLine = ({
   const fromHandle = handleId ? handleBounds.find((d) => d.id === handleId) : handleBounds[0];
   const fromHandleX = fromHandle ? fromHandle.x + fromHandle.width / 2 : (fromNode.measured.width ?? 0) / 2;
   const fromHandleY = fromHandle ? fromHandle.y + fromHandle.height / 2 : fromNode.measured.height ?? 0;
-  const fromX = (fromNode.internals.positionAbsolute.x ?? 0) + fromHandleX;
-  const fromY = (fromNode.internals.positionAbsolute.y ?? 0) + fromHandleY;
+  const fromX = fromNode.internals.positionAbsolute.x + fromHandleX;
+  const fromY = fromNode.internals.positionAbsolute.y + fromHandleY;
   const fromPosition = fromHandle?.position;
   const toPosition = fromPosition ? oppositePosition[fromPosition] : null;
 
diff --git a/packages/react/src/types/nodes.ts b/packages/react/src/types/nodes.ts
index 89fec455..a01a894a 100644
--- a/packages/react/src/types/nodes.ts
+++ b/packages/react/src/types/nodes.ts
@@ -24,6 +24,12 @@ export type Node<
   focusable?: boolean;
 };
 
+/**
+ * The node data structure that gets used for internal nodes.
+ * There are some data structures added under node.internal
+ * that are needed for tracking some properties
+ * @public
+ */
 export type InternalNode<NodeType extends Node = Node> = InternalNodeBase<NodeType>;
 
 export type NodeMouseHandler<NodeType extends Node = Node> = (event: ReactMouseEvent, node: NodeType) => void;
diff --git a/packages/svelte/.prettierignore b/packages/svelte/.prettierignore
index 38972655..33affffb 100644
--- a/packages/svelte/.prettierignore
+++ b/packages/svelte/.prettierignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /build
+/dist
 /.svelte-kit
 /package
 .env
diff --git a/packages/svelte/src/lib/components/Handle/Handle.svelte b/packages/svelte/src/lib/components/Handle/Handle.svelte
index 5217686c..f93688fc 100644
--- a/packages/svelte/src/lib/components/Handle/Handle.svelte
+++ b/packages/svelte/src/lib/components/Handle/Handle.svelte
@@ -42,7 +42,7 @@
   const {
     connectionMode,
     domNode,
-    nodes,
+    nodeLookup,
     connectionRadius,
     viewport,
     isValidConnection,
@@ -72,7 +72,7 @@
         isTarget,
         connectionRadius: $connectionRadius,
         domNode: $domNode,
-        nodes: $nodes,
+        nodeLookup: $nodeLookup,
         connectionMode: $connectionMode,
         lib: $lib,
         autoPanOnConnect: $autoPanOnConnect,
diff --git a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte
index e502cd50..a466d0ad 100644
--- a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte
+++ b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte
@@ -35,8 +35,8 @@
   export let sourcePosition: $$Props['sourcePosition'] = undefined;
   export let targetPosition: $$Props['targetPosition'] = undefined;
   export let zIndex: $$Props['zIndex'];
-  export let computedWidth: $$Props['computedWidth'] = undefined;
-  export let computedHeight: $$Props['computedHeight'] = undefined;
+  export let measuredWidth: $$Props['measuredWidth'] = undefined;
+  export let measuredHeight: $$Props['measuredHeight'] = undefined;
   export let initialWidth: $$Props['initialWidth'] = undefined;
   export let initialHeight: $$Props['initialHeight'] = undefined;
   export let width: $$Props['width'] = undefined;
@@ -79,8 +79,8 @@
     height,
     initialWidth,
     initialHeight,
-    computedWidth,
-    computedHeight
+    measuredWidth,
+    measuredHeight
   });
 
   $: {
diff --git a/packages/svelte/src/lib/components/NodeWrapper/types.ts b/packages/svelte/src/lib/components/NodeWrapper/types.ts
index a290ec08..7277be5f 100644
--- a/packages/svelte/src/lib/components/NodeWrapper/types.ts
+++ b/packages/svelte/src/lib/components/NodeWrapper/types.ts
@@ -21,8 +21,8 @@ export type NodeWrapperProps = Pick<
   | 'initialWidth'
   | 'initialHeight'
 > & {
-  computedWidth?: number;
-  computedHeight?: number;
+  measuredWidth?: number;
+  measuredHeight?: number;
   type: string;
   positionX: number;
   positionY: number;
diff --git a/packages/svelte/src/lib/components/NodeWrapper/utils.ts b/packages/svelte/src/lib/components/NodeWrapper/utils.ts
index b2609587..f795e31d 100644
--- a/packages/svelte/src/lib/components/NodeWrapper/utils.ts
+++ b/packages/svelte/src/lib/components/NodeWrapper/utils.ts
@@ -3,20 +3,20 @@ export function getNodeInlineStyleDimensions({
   height,
   initialWidth,
   initialHeight,
-  computedWidth,
-  computedHeight
+  measuredWidth,
+  measuredHeight
 }: {
   width?: number;
   height?: number;
   initialWidth?: number;
   initialHeight?: number;
-  computedWidth?: number;
-  computedHeight?: number;
+  measuredWidth?: number;
+  measuredHeight?: number;
 }): {
   width: string | undefined;
   height: string | undefined;
 } {
-  if (computedWidth === undefined && computedHeight === undefined) {
+  if (measuredWidth === undefined && measuredHeight === undefined) {
     const styleWidth = width ?? initialWidth;
     const styleHeight = height ?? initialHeight;
 
diff --git a/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte b/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
index 8761942d..ae400eb5 100644
--- a/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
+++ b/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
@@ -1,11 +1,6 @@
 <script lang="ts">
   import { onDestroy } from 'svelte';
-  import {
-    internalsSymbol,
-    getPositionWithOrigin,
-    getNodeDimensions,
-    nodeHasDimensions
-  } from '@xyflow/system';
+  import { getPositionWithOrigin, getNodeDimensions, nodeHasDimensions } from '@xyflow/system';
 
   import { NodeWrapper } from '$lib/components/NodeWrapper';
   import { useStore } from '$lib/store';
@@ -46,8 +41,8 @@
   {#each $visibleNodes as node (node.id)}
     {@const nodeDimesions = getNodeDimensions(node)}
     {@const posOrigin = getPositionWithOrigin({
-      x: node.computed?.positionAbsolute?.x ?? 0,
-      y: node.computed?.positionAbsolute?.y ?? 0,
+      x: node.internals.positionAbsolute.x,
+      y: node.internals.positionAbsolute.y,
       ...nodeDimesions,
       origin: node.origin
     })}
@@ -66,26 +61,26 @@
         node.connectable ||
         ($nodesConnectable && typeof node.connectable === 'undefined')
       )}
-      positionX={node.computed?.positionAbsolute?.x ?? 0}
-      positionY={node.computed?.positionAbsolute?.y ?? 0}
+      positionX={node.internals.positionAbsolute.x}
+      positionY={node.internals.positionAbsolute.y}
       positionOriginX={posOrigin.x ?? 0}
       positionOriginY={posOrigin.y ?? 0}
-      isParent={!!node[internalsSymbol]?.isParent}
+      isParent={!!node.internals.isParent}
       style={node.style}
       class={node.class}
       type={node.type ?? 'default'}
       sourcePosition={node.sourcePosition}
       targetPosition={node.targetPosition}
       dragging={node.dragging}
-      zIndex={node[internalsSymbol]?.z ?? 0}
+      zIndex={node.internals.z ?? 0}
       dragHandle={node.dragHandle}
       initialized={nodeHasDimensions(node)}
       width={node.width}
       height={node.height}
       initialWidth={node.initialWidth}
       initialHeight={node.initialHeight}
-      computedWidth={node.computed?.width}
-      computedHeight={node.computed?.height}
+      measuredWidth={node.measured.width}
+      measuredHeight={node.measured.height}
       {resizeObserver}
       on:nodeclick
       on:nodemouseenter
diff --git a/packages/svelte/src/lib/container/Pane/Pane.svelte b/packages/svelte/src/lib/container/Pane/Pane.svelte
index 6a8d4dd8..05cbdb41 100644
--- a/packages/svelte/src/lib/container/Pane/Pane.svelte
+++ b/packages/svelte/src/lib/container/Pane/Pane.svelte
@@ -17,10 +17,7 @@
       const isSelected = ids.includes(item.id);
 
       if (item.selected !== isSelected) {
-        return {
-          ...item,
-          selected: isSelected
-        };
+        item.selected = isSelected;
       }
 
       return item;
@@ -56,6 +53,7 @@
   }>();
   const {
     nodes,
+    nodeLookup,
     edges,
     viewport,
     dragging,
@@ -130,8 +128,8 @@
     const prevSelectedNodeIds = selectedNodes.map((n) => n.id);
     const prevSelectedEdgeIds = getConnectedEdges(selectedNodes, $edges).map((e) => e.id);
 
-    selectedNodes = getNodesInside<Node>(
-      $nodes,
+    selectedNodes = getNodesInside(
+      $nodeLookup,
       nextUserSelectRect,
       [$viewport.x, $viewport.y, $viewport.zoom],
       $selectionMode === SelectionMode.Partial,
@@ -172,7 +170,7 @@
     selectionRect.set(null);
 
     if (selectedNodes.length > 0) {
-      selectionRectMode.set('nodes');
+      $selectionRectMode = 'nodes';
     }
 
     // onSelectionEnd?.(event);
diff --git a/packages/svelte/src/lib/hooks/useNodesData.ts b/packages/svelte/src/lib/hooks/useNodesData.ts
index 83db2115..a13bdb65 100644
--- a/packages/svelte/src/lib/hooks/useNodesData.ts
+++ b/packages/svelte/src/lib/hooks/useNodesData.ts
@@ -29,7 +29,7 @@ export function useNodesData(nodeIds: any): any {
     const _nodeIds = isArrayOfIds ? nodeIds : [nodeIds];
 
     for (const nodeId of _nodeIds) {
-      const node = nodeLookup.get(nodeId);
+      const node = nodeLookup.get(nodeId)?.internals.userNode;
       if (node) {
         nextNodesData.push({
           id: node.id,
diff --git a/packages/svelte/src/lib/hooks/useSvelteFlow.ts b/packages/svelte/src/lib/hooks/useSvelteFlow.ts
index 22d7de6f..6c83418f 100644
--- a/packages/svelte/src/lib/hooks/useSvelteFlow.ts
+++ b/packages/svelte/src/lib/hooks/useSvelteFlow.ts
@@ -256,17 +256,28 @@ export function useSvelteFlow(): {
     nodeUpdate: Partial<Node> | ((node: Node) => Partial<Node>),
     options: { replace: boolean } = { replace: false }
   ) => {
-    nodes.update((nds) =>
-      nds.map((node) => {
-        if (node.id === id) {
-          const nextNode = typeof nodeUpdate === 'function' ? nodeUpdate(node as Node) : nodeUpdate;
+    const node = get(nodeLookup).get(id)?.internals.userNode;
 
-          return options.replace && isNode(nextNode) ? nextNode : { ...node, ...nextNode };
-        }
+    if (!node) {
+      return;
+    }
 
-        return node;
-      })
-    );
+    const nextNode = typeof nodeUpdate === 'function' ? nodeUpdate(node as Node) : nodeUpdate;
+
+    if (options.replace) {
+      nodes.update((nds) =>
+        nds.map((node) => {
+          if (node.id === id) {
+            return isNode(nextNode) ? nextNode : { ...node, ...nextNode };
+          }
+
+          return node;
+        })
+      );
+    } else {
+      Object.assign(node, nextNode);
+      nodes.update((nds) => nds);
+    }
   };
 
   return {
@@ -331,11 +342,12 @@ export function useSvelteFlow(): {
       }
 
       return (nodesToIntersect || get(nodes)).filter((n) => {
-        if (!isRect && (n.id === nodeOrRect.id || !n.computed?.positionAbsolute)) {
+        const internalNode = get(nodeLookup).get(n.id);
+        if (!internalNode || (!isRect && n.id === nodeOrRect.id)) {
           return false;
         }
 
-        const currNodeRect = nodeToRect(n);
+        const currNodeRect = nodeToRect(internalNode);
         const overlappingArea = getOverlappingArea(currNodeRect, nodeRect);
         const partiallyVisible = partially && overlappingArea > 0;
 
@@ -447,13 +459,17 @@ export function useSvelteFlow(): {
     },
     updateNode,
     updateNodeData: (id, dataUpdate, options) => {
-      updateNode(id, (node) => {
-        const nextData = typeof dataUpdate === 'function' ? dataUpdate(node) : dataUpdate;
+      const node = get(nodeLookup).get(id)?.internals.userNode;
 
-        return options?.replace
-          ? { ...node, data: nextData }
-          : { ...node, data: { ...node.data, ...nextData } };
-      });
+      if (!node) {
+        return;
+      }
+
+      const nextData = typeof dataUpdate === 'function' ? dataUpdate(node) : dataUpdate;
+
+      node.data = options?.replace ? nextData : { ...node.data, ...nextData };
+
+      nodes.update((nds) => nds);
     },
     viewport
   };
diff --git a/packages/svelte/src/lib/index.ts b/packages/svelte/src/lib/index.ts
index 771116c3..72808cda 100644
--- a/packages/svelte/src/lib/index.ts
+++ b/packages/svelte/src/lib/index.ts
@@ -116,6 +116,5 @@ export {
   getOutgoers,
   getConnectedEdges,
   addEdge,
-  updateEdge,
-  internalsSymbol
+  updateEdge
 } from '@xyflow/system';
diff --git a/packages/svelte/src/lib/plugins/NodeResizer/ResizeControl.svelte b/packages/svelte/src/lib/plugins/NodeResizer/ResizeControl.svelte
index c67f2e87..c346bd53 100644
--- a/packages/svelte/src/lib/plugins/NodeResizer/ResizeControl.svelte
+++ b/packages/svelte/src/lib/plugins/NodeResizer/ResizeControl.svelte
@@ -69,7 +69,7 @@
           };
         },
         onChange: (change: XYResizerChange, childChanges: XYResizerChildChange[]) => {
-          const node = $nodeLookup.get(id);
+          const node = $nodeLookup.get(id)?.internals.userNode;
           if (node) {
             node.height = change.isHeightChange ? change.height : node.height;
             node.width = change.isWidthChange ? change.width : node.width;
@@ -79,7 +79,7 @@
                 : node.position;
 
             for (const childChange of childChanges) {
-              const childNode = $nodeLookup.get(childChange.id);
+              const childNode = $nodeLookup.get(childChange.id)?.internals.userNode;
               if (childNode) {
                 childNode.position = childChange.position;
               }
diff --git a/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte b/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
index ca6dba1f..82250117 100644
--- a/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
+++ b/packages/svelte/src/lib/plugins/NodeToolbar/NodeToolbar.svelte
@@ -1,14 +1,8 @@
 <script lang="ts">
   import { getContext } from 'svelte';
-  import {
-    getNodesBounds,
-    Position,
-    type Rect,
-    internalsSymbol,
-    getNodeToolbarTransform
-  } from '@xyflow/system';
+  import { getNodesBounds, Position, type Rect, getNodeToolbarTransform } from '@xyflow/system';
   import portal from '$lib/actions/portal';
-  import type { Node } from '$lib/types';
+  import type { InternalNode } from '$lib/types';
   import { useStore } from '$lib/store';
 
   import type { NodeToolbarProps } from './types';
@@ -25,26 +19,26 @@
   const contextNodeId = getContext<string>('svelteflow__node_id');
 
   let transform: string;
-  let toolbarNodes: Node[] = [];
+  let toolbarNodes: InternalNode[] = [];
   let _offset = offset !== undefined ? offset : 10;
   let _position = position !== undefined ? position : Position.Top;
   let _align = align !== undefined ? align : 'center';
 
   $: {
-    // $nodes only needed to trigger updates, $nodeLookup is just a helper that does not trigger any updates
-    if ($nodes) {
-      const nodeIds = Array.isArray(nodeId) ? nodeId : [nodeId || contextNodeId];
+    // nly needed to trigger updates, $nodeLookup is just a helper that does not trigger any updates
+    $nodes;
 
-      toolbarNodes = nodeIds.reduce<Node[]>((res, nodeId) => {
-        const node = $nodeLookup.get(nodeId);
+    const nodeIds = Array.isArray(nodeId) ? nodeId : [nodeId || contextNodeId];
 
-        if (node) {
-          res.push(node);
-        }
+    toolbarNodes = nodeIds.reduce<InternalNode[]>((res, nodeId) => {
+      const node = $nodeLookup.get(nodeId);
 
-        return res;
-      }, []);
-    }
+      if (node) {
+        res.push(node);
+      }
+
+      return res;
+    }, []);
   }
 
   $: {
@@ -54,8 +48,8 @@
       const toolbarNode = toolbarNodes[0];
       nodeRect = {
         ...toolbarNode.position,
-        width: toolbarNode.computed?.width ?? toolbarNode.width ?? 0,
-        height: toolbarNode.computed?.height ?? toolbarNode.height ?? 0
+        width: toolbarNode.measured.width ?? toolbarNode.width ?? 0,
+        height: toolbarNode.measured.height ?? toolbarNode.height ?? 0
       };
     } else if (toolbarNodes.length > 1) {
       nodeRect = getNodesBounds(toolbarNodes, { nodeOrigin: $nodeOrigin });
@@ -69,7 +63,7 @@
   $: zIndex =
     toolbarNodes.length === 0
       ? 1
-      : Math.max(...toolbarNodes.map((node) => (node[internalsSymbol]?.z || 5) + 1));
+      : Math.max(...toolbarNodes.map((node) => (node.internals.z || 5) + 1));
 
   //FIXME: Possible performance bottleneck
   $: selectedNodesCount = $nodes.filter((node) => node.selected).length;
diff --git a/packages/svelte/src/lib/store/derived-connection-props.ts b/packages/svelte/src/lib/store/derived-connection-props.ts
index 0edf3c6c..fc98366e 100644
--- a/packages/svelte/src/lib/store/derived-connection-props.ts
+++ b/packages/svelte/src/lib/store/derived-connection-props.ts
@@ -6,7 +6,6 @@ import {
   ConnectionLineType,
   ConnectionMode,
   Position,
-  internalsSymbol,
   type HandleElement
 } from '@xyflow/system';
 
@@ -65,8 +64,9 @@ export function getDerivedConnectionProps(
         return initConnectionProps;
       }
 
+      // TODO: it should bail out if the node is not found
       const fromNode = nodeLookup.get(connection.connectionStartHandle?.nodeId);
-      const fromHandleBounds = fromNode?.[internalsSymbol]?.handleBounds;
+      const fromHandleBounds = fromNode?.internals.handleBounds;
       const handleBoundsStrict =
         fromHandleBounds?.[connection.connectionStartHandle.type || 'source'] || [];
       const handleBoundsLoose: HandleElement[] | undefined | null = handleBoundsStrict
@@ -81,12 +81,12 @@ export function getDerivedConnectionProps(
         : handleBounds?.[0];
       const fromHandleX = fromHandle
         ? fromHandle.x + fromHandle.width / 2
-        : (fromNode?.computed?.width ?? 0) / 2;
+        : (fromNode?.measured.width ?? 0) / 2;
       const fromHandleY = fromHandle
         ? fromHandle.y + fromHandle.height / 2
-        : fromNode?.computed?.height ?? 0;
-      const fromX = (fromNode?.computed?.positionAbsolute?.x ?? 0) + fromHandleX;
-      const fromY = (fromNode?.computed?.positionAbsolute?.y ?? 0) + fromHandleY;
+        : fromNode?.measured.height ?? 0;
+      const fromX = (fromNode?.internals.positionAbsolute.x ?? 0) + fromHandleX;
+      const fromY = (fromNode?.internals.positionAbsolute.y ?? 0) + fromHandleY;
       const fromPosition = fromHandle?.position;
       const toPosition = fromPosition ? oppositePosition[fromPosition] : undefined;
 
diff --git a/packages/svelte/src/lib/store/index.ts b/packages/svelte/src/lib/store/index.ts
index 4d7a0a9f..2f6266eb 100644
--- a/packages/svelte/src/lib/store/index.ts
+++ b/packages/svelte/src/lib/store/index.ts
@@ -64,52 +64,71 @@ export function createStore({
   const updateNodePositions: UpdateNodePositions = (nodeDragItems, dragging = false) => {
     const nodeLookup = get(store.nodeLookup);
 
-    nodeDragItems.forEach((nodeDragItem) => {
-      const node = nodeLookup.get(nodeDragItem.id);
+    for (const nodeDragItem of nodeDragItems) {
+      const node = nodeLookup.get(nodeDragItem.id)?.internals.userNode;
 
-      if (node) {
-        node.position = nodeDragItem.position;
-        node.dragging = dragging;
-        node.computed = {
-          ...node.computed,
-          positionAbsolute: nodeDragItem.computed?.positionAbsolute
-        };
+      if (!node) {
+        continue;
       }
-    });
 
-    store.nodes.set(get(store.nodes));
+      node.position = nodeDragItem.position;
+      node.dragging = dragging;
+    }
+
+    store.nodes.update((nds) => nds);
   };
 
   function updateNodeDimensions(updates: Map<string, NodeDimensionUpdate>) {
-    const nextNodes = updateNodeDimensionsSystem(
+    const nodeLookup = get(store.nodeLookup);
+    const changes = updateNodeDimensionsSystem(
       updates,
-      get(store.nodes),
-      get(store.nodeLookup),
+      nodeLookup,
       get(store.domNode),
       get(store.nodeOrigin)
     );
 
-    if (!nextNodes) {
+    if (!changes) {
       return;
     }
 
     if (!get(store.fitViewOnInitDone) && get(store.fitViewOnInit)) {
       const fitViewOptions = get(store.fitViewOptions);
-      const fitViewOnInitDone = fitView(nextNodes, {
+      const fitViewOnInitDone = fitView({
         ...fitViewOptions,
-        nodes: fitViewOptions?.nodes || nextNodes
+        nodes: fitViewOptions?.nodes
       });
       store.fitViewOnInitDone.set(fitViewOnInitDone);
     }
 
-    store.nodes.set(nextNodes);
+    for (const change of changes) {
+      const node = nodeLookup.get(change.id)?.internals.userNode;
+
+      if (!node) {
+        continue;
+      }
+
+      switch (change.type) {
+        case 'dimensions': {
+          const measured = { ...node.measured, ...change.dimensions };
+          node.width = change.dimensions?.width ?? node.width;
+          node.height = change.dimensions?.height ?? node.height;
+          node.measured = measured;
+          break;
+        }
+        case 'position':
+          node.position = change.position ?? node.position;
+          break;
+      }
+    }
+
+    store.nodes.update((nds) => nds);
 
     if (!get(store.nodesInitialized)) {
       store.nodesInitialized.set(true);
     }
   }
 
-  function fitView(nodes: Node[], options?: FitViewOptions) {
+  function fitView(options?: FitViewOptions) {
     const panZoom = get(store.panZoom);
 
     if (!panZoom) {
@@ -118,7 +137,7 @@ export function createStore({
 
     return fitViewUtil(
       {
-        nodes,
+        nodeLookup: get(store.nodeLookup),
         width: get(store.width),
         height: get(store.height),
         minZoom: get(store.minZoom),
@@ -186,10 +205,10 @@ export function createStore({
 
   function unselectNodesAndEdges(params?: { nodes?: Node[]; edges?: Edge[] }) {
     const resetNodes = resetSelectedElements(params?.nodes || get(store.nodes));
-    if (resetNodes) store.nodes.set(get(store.nodes));
+    if (resetNodes) store.nodes.update((nds) => nds);
 
     const resetEdges = resetSelectedElements(params?.edges || get(store.edges));
-    if (resetEdges) store.edges.set(get(store.edges));
+    if (resetEdges) store.edges.update((nds) => nds);
   }
 
   store.deleteKeyPressed.subscribe(async (deleteKeyPressed) => {
@@ -384,7 +403,7 @@ export function createStore({
     updateNodeDimensions,
     zoomIn,
     zoomOut,
-    fitView: (options?: FitViewOptions) => fitView(get(store.nodes), options),
+    fitView: (options?: FitViewOptions) => fitView(options),
     setMinZoom,
     setMaxZoom,
     setTranslateExtent,
diff --git a/packages/svelte/src/lib/store/initial-store.ts b/packages/svelte/src/lib/store/initial-store.ts
index 525ee6b5..7d2b2444 100644
--- a/packages/svelte/src/lib/store/initial-store.ts
+++ b/packages/svelte/src/lib/store/initial-store.ts
@@ -5,7 +5,7 @@ import {
   ConnectionMode,
   ConnectionLineType,
   devWarn,
-  adoptUserProvidedNodes,
+  adoptUserNodes,
   getNodesBounds,
   getViewportForBounds,
   updateConnectionLookup,
@@ -47,7 +47,8 @@ import type {
   OnDelete,
   OnEdgeCreate,
   OnBeforeDelete,
-  IsValidConnection
+  IsValidConnection,
+  InternalNode
 } from '$lib/types';
 import { createNodesStore, createEdgesStore } from './utils';
 import { initConnectionProps, type ConnectionProps } from './derived-connection-props';
@@ -80,9 +81,10 @@ export const getInitialStore = ({
   fitView?: boolean;
 }) => {
   const nodeLookup: NodeLookup = new Map();
-  const nextNodes = adoptUserProvidedNodes(nodes, nodeLookup, {
+  adoptUserNodes(nodes, nodeLookup, {
     nodeOrigin: [0, 0],
-    elevateNodesOnSelect: false
+    elevateNodesOnSelect: false,
+    checkEquality: false
   });
   const connectionLookup = new Map();
   const edgeLookup = new Map();
@@ -91,9 +93,10 @@ export const getInitialStore = ({
   let viewport: Viewport = { x: 0, y: 0, zoom: 1 };
 
   if (fitView && width && height) {
-    const nodesWithDimensions = nextNodes.filter(
+    const nodesWithDimensions = nodes.filter(
       (node) => (node.width && node.height) || (node.initialWidth && node.initialHeight)
     );
+
     // @todo users nodeOrigin should be used here
     const bounds = getNodesBounds(nodesWithDimensions, { nodeOrigin: [0, 0] });
     viewport = getViewportForBounds(bounds, width, height, 0.5, 2, 0.1);
@@ -101,10 +104,10 @@ export const getInitialStore = ({
 
   return {
     flowId: writable<string | null>(null),
-    nodes: createNodesStore(nextNodes, nodeLookup),
-    nodeLookup: readable<NodeLookup<Node>>(nodeLookup),
+    nodes: createNodesStore(nodes, nodeLookup),
+    nodeLookup: readable<NodeLookup<InternalNode>>(nodeLookup),
     edgeLookup: readable<EdgeLookup<Edge>>(edgeLookup),
-    visibleNodes: readable<Node[]>([]),
+    visibleNodes: readable<InternalNode[]>([]),
     edges: createEdgesStore(edges, connectionLookup, edgeLookup),
     visibleEdges: readable<EdgeLayouted[]>([]),
     connectionLookup: readable<ConnectionLookup>(connectionLookup),
diff --git a/packages/svelte/src/lib/store/utils.ts b/packages/svelte/src/lib/store/utils.ts
index a6ba38de..4dabbd33 100644
--- a/packages/svelte/src/lib/store/utils.ts
+++ b/packages/svelte/src/lib/store/utils.ts
@@ -16,7 +16,7 @@ import {
   type NodeLookup
 } from '@xyflow/system';
 
-import type { DefaultEdgeOptions, DefaultNodeOptions, Edge, Node } from '$lib/types';
+import type { DefaultEdgeOptions, DefaultNodeOptions, Edge, InternalNode, Node } from '$lib/types';
 
 // we need to sync the user nodes and the internal nodes so that the user can receive the updates
 // made by Svelte Flow (like dragging or selecting a node).
@@ -127,7 +127,7 @@ export type NodeStoreOptions = {
 // The user only passes in relative positions, so we need to calculate the absolute positions based on the parent nodes.
 export const createNodesStore = (
   nodes: Node[],
-  nodeLookup: NodeLookup<Node>
+  nodeLookup: NodeLookup<InternalNode>
 ): {
   subscribe: (this: void, run: Subscriber<Node[]>) => Unsubscriber;
   update: (this: void, updater: Updater<Node[]>) => void;
@@ -141,12 +141,13 @@ export const createNodesStore = (
   let elevateNodesOnSelect = true;
 
   const _set = (nds: Node[]): Node[] => {
-    const nextNodes = adoptUserNodes(nds, nodeLookup, {
+    adoptUserNodes(nds, nodeLookup, {
       elevateNodesOnSelect,
-      defaults
+      defaults,
+      checkEquality: false
     });
 
-    value = nextNodes;
+    value = nds;
 
     set(value);
 
diff --git a/packages/svelte/src/lib/store/visible-nodes.ts b/packages/svelte/src/lib/store/visible-nodes.ts
index 2d9ab7fb..e615439f 100644
--- a/packages/svelte/src/lib/store/visible-nodes.ts
+++ b/packages/svelte/src/lib/store/visible-nodes.ts
@@ -1,18 +1,23 @@
 import { derived } from 'svelte/store';
 import { getNodesInside, type Transform } from '@xyflow/system';
-
-import type { Node } from '$lib/types';
 import type { SvelteFlowStoreState } from './types';
 
 export function getVisibleNodes(store: SvelteFlowStoreState) {
   return derived(
-    [store.nodes, store.onlyRenderVisibleElements, store.width, store.height, store.viewport],
-    ([nodes, onlyRenderVisibleElements, width, height, viewport]) => {
+    [
+      store.nodeLookup,
+      store.onlyRenderVisibleElements,
+      store.width,
+      store.height,
+      store.viewport,
+      store.nodes
+    ],
+    ([nodeLookup, onlyRenderVisibleElements, width, height, viewport]) => {
       const transform: Transform = [viewport.x, viewport.y, viewport.zoom];
 
       return onlyRenderVisibleElements
-        ? getNodesInside<Node>(nodes, { x: 0, y: 0, width, height }, transform, true)
-        : nodes;
+        ? getNodesInside(nodeLookup, { x: 0, y: 0, width, height }, transform, true)
+        : Array.from(nodeLookup.values());
     }
   );
 }
diff --git a/packages/svelte/src/lib/types/nodes.ts b/packages/svelte/src/lib/types/nodes.ts
index 2cd9262c..488b306f 100644
--- a/packages/svelte/src/lib/types/nodes.ts
+++ b/packages/svelte/src/lib/types/nodes.ts
@@ -1,5 +1,13 @@
 import type { ComponentType, SvelteComponent } from 'svelte';
-import type { NodeBase, NodeProps as NodePropsBase } from '@xyflow/system';
+import type { InternalNodeBase, NodeBase, NodeProps as NodePropsBase } from '@xyflow/system';
+
+/**
+ * The node data structure that gets used for internal nodes.
+ * There are some data structures added under node.internal
+ * that are needed for tracking some properties
+ * @public
+ */
+export type InternalNode<NodeType extends Node = Node> = InternalNodeBase<NodeType>;
 
 /**
  * The node data structure that gets used for the nodes prop.
diff --git a/packages/system/src/utils/edges/positions.ts b/packages/system/src/utils/edges/positions.ts
index de8416db..6e61ce8c 100644
--- a/packages/system/src/utils/edges/positions.ts
+++ b/packages/system/src/utils/edges/positions.ts
@@ -97,8 +97,8 @@ function toHandleBounds(handles?: NodeHandle[]) {
 }
 
 function getHandlePosition(position: Position, node: InternalNodeBase, handle: HandleElement | null = null): number[] {
-  const x = (handle?.x ?? 0) + (node.internals.positionAbsolute?.x ?? 0);
-  const y = (handle?.y ?? 0) + (node.internals.positionAbsolute?.y ?? 0);
+  const x = (handle?.x ?? 0) + node.internals.positionAbsolute.x;
+  const y = (handle?.y ?? 0) + node.internals.positionAbsolute.y;
   const { width, height } = handle ?? getNodeDimensions(node);
 
   switch (position) {
diff --git a/packages/system/src/utils/graph.ts b/packages/system/src/utils/graph.ts
index 273a0057..3bf70267 100644
--- a/packages/system/src/utils/graph.ts
+++ b/packages/system/src/utils/graph.ts
@@ -230,14 +230,14 @@ export const getNodesInside = <NodeType extends NodeBase = NodeBase>(
   // set excludeNonSelectableNodes if you want to pay attention to the nodes "selectable" attribute
   excludeNonSelectableNodes = false,
   nodeOrigin: NodeOrigin = [0, 0]
-): NodeType[] => {
+): InternalNodeBase<NodeType>[] => {
   const paneRect = {
     ...pointToRendererPoint(rect, [tx, ty, tScale]),
     width: rect.width / tScale,
     height: rect.height / tScale,
   };
 
-  const visibleNodes: NodeType[] = [];
+  const visibleNodes: InternalNodeBase<NodeType>[] = [];
 
   for (const [, node] of nodeLookup) {
     const { measured, selectable = true, hidden = false } = node;
@@ -290,6 +290,7 @@ export function fitView<Params extends FitViewParamsBase<NodeBase>, Options exte
   nodeLookup.forEach((n) => {
     const isVisible = n.measured.width && n.measured.height && (options?.includeHiddenNodes || !n.hidden);
 
+    // TODO: this remove options.nodes.some with a Set
     if (
       isVisible &&
       (!options?.nodes || (options?.nodes.length && options?.nodes.some((optionNode) => optionNode.id === n.id)))
diff --git a/packages/system/src/utils/store.ts b/packages/system/src/utils/store.ts
index 601f4681..38a01b76 100644
--- a/packages/system/src/utils/store.ts
+++ b/packages/system/src/utils/store.ts
@@ -14,6 +14,8 @@ import {
   NodeChange,
   NodeLookup,
   Rect,
+  NodeDimensionChange,
+  NodePositionChange,
 } from '../types';
 import { getDimensions, getHandleBounds } from './dom';
 import { getBoundsOfRects, getNodeDimensions, isNumeric, nodeToRect } from './general';
@@ -68,6 +70,7 @@ type UpdateNodesOptions<NodeType extends NodeBase> = {
   nodeOrigin?: NodeOrigin;
   elevateNodesOnSelect?: boolean;
   defaults?: Partial<NodeType>;
+  checkEquality?: boolean;
 };
 
 export function adoptUserNodes<NodeType extends NodeBase>(
@@ -77,6 +80,7 @@ export function adoptUserNodes<NodeType extends NodeBase>(
     nodeOrigin: [0, 0] as NodeOrigin,
     elevateNodesOnSelect: true,
     defaults: {},
+    checkEquality: true,
   }
 ) {
   const tmpLookup = new Map(nodeLookup);
@@ -91,7 +95,7 @@ export function adoptUserNodes<NodeType extends NodeBase>(
       parentNodeIds.add(userNode.parentId);
     }
 
-    if (userNode === currentStoreNode?.internals.userNode) {
+    if (options.checkEquality && userNode === currentStoreNode?.internals.userNode) {
       nodeLookup.set(userNode.id, currentStoreNode);
     } else {
       nodeLookup.set(userNode.id, {
@@ -103,7 +107,7 @@ export function adoptUserNodes<NodeType extends NodeBase>(
         },
         internals: {
           positionAbsolute: userNode.position,
-          handleBounds: currentStoreNode?.internals?.handleBounds,
+          handleBounds: currentStoreNode?.internals.handleBounds,
           z: (isNumeric(userNode.zIndex) ? userNode.zIndex : 0) + (userNode.selected ? selectedNodeZ : 0),
           userNode,
           isParent: false,
@@ -142,8 +146,11 @@ function calculateXYZPosition<NodeType extends NodeBase>(
   );
 }
 
-export function handleParentExpand(nodes: InternalNodeBase[], nodeLookup: NodeLookup): NodeChange[] {
-  const changes: NodeChange[] = [];
+export function handleParentExpand(
+  nodes: InternalNodeBase[],
+  nodeLookup: NodeLookup
+): (NodeDimensionChange | NodePositionChange)[] {
+  const changes: (NodeDimensionChange | NodePositionChange)[] = [];
   const chilNodeRects = new Map<string, Rect>();
 
   nodes.forEach((node) => {
@@ -211,14 +218,14 @@ export function updateNodeDimensions<NodeType extends InternalNodeBase>(
   nodeLookup: Map<string, NodeType>,
   domNode: HTMLElement | null,
   nodeOrigin?: NodeOrigin
-): NodeChange[] {
+): (NodeDimensionChange | NodePositionChange)[] {
   const viewportNode = domNode?.querySelector('.xyflow__viewport');
 
   if (!viewportNode) {
     return [];
   }
 
-  const changes: NodeChange[] = [];
+  const changes: (NodeDimensionChange | NodePositionChange)[] = [];
   const style = window.getComputedStyle(viewportNode);
   const { m22: zoom } = new window.DOMMatrixReadOnly(style.transform);
   // in this array we collect nodes, that might trigger changes (like expanding parent)
diff --git a/packages/system/src/xydrag/utils.ts b/packages/system/src/xydrag/utils.ts
index adead2b7..b1cd0597 100644
--- a/packages/system/src/xydrag/utils.ts
+++ b/packages/system/src/xydrag/utils.ts
@@ -55,8 +55,8 @@ export function getDragItems<NodeType extends NodeBase>(
         id: internalNode.id,
         position: internalNode.position || { x: 0, y: 0 },
         distance: {
-          x: mousePos.x - (internalNode.internals.positionAbsolute?.x ?? 0),
-          y: mousePos.y - (internalNode.internals.positionAbsolute?.y ?? 0),
+          x: mousePos.x - internalNode.internals.positionAbsolute.x,
+          y: mousePos.y - internalNode.internals.positionAbsolute.y,
         },
         extent: internalNode.extent,
         parentId: internalNode.parentId,
diff --git a/packages/system/src/xyhandle/utils.ts b/packages/system/src/xyhandle/utils.ts
index 346ebe45..ba18e79a 100644
--- a/packages/system/src/xyhandle/utils.ts
+++ b/packages/system/src/xyhandle/utils.ts
@@ -22,8 +22,8 @@ export function getHandles(
         id: h.id || null,
         type,
         nodeId: node.id,
-        x: (node.internals.positionAbsolute.x ?? 0) + h.x + h.width / 2,
-        y: (node.internals.positionAbsolute.y ?? 0) + h.y + h.height / 2,
+        x: node.internals.positionAbsolute.x + h.x + h.width / 2,
+        y: node.internals.positionAbsolute.y + h.y + h.height / 2,
       });
     }
     return res;