diff --git a/src/components/canvas.jsx b/src/components/canvas.jsx
index 964fa11..59feae1 100644
--- a/src/components/canvas.jsx
+++ b/src/components/canvas.jsx
@@ -6,6 +6,10 @@ export default function Canvas(props) {
   const [dragging, setDragging] = useState(-1);
   const [linking, setLinking] = useState(false);
   const [line, setLine] = useState({
+    startTableId: -1,
+    startFieldId: -1,
+    endTableId: -1,
+    endFieldId: -1,
     startX: 0,
     startY: 0,
     endX: 0,
@@ -61,6 +65,7 @@ export default function Canvas(props) {
 
       setRelationships(
         relationships.map((r) => ({
+          ...r,
           startX: r.startX + dx,
           startY: r.startY + dy,
           endX: r.endX + dx,
@@ -80,6 +85,24 @@ export default function Canvas(props) {
         return t;
       });
       props.setTables(updatedTables);
+      const updatedRelationShips = relationships.map((r) => {
+        if (r.startTableId === dragging - 1) {
+          return {
+            ...r,
+            startX: props.tables[r.startTableId].x + 15,
+            startY:
+              props.tables[r.startTableId].y + r.startFieldId * 36 + 40 + 19,
+          };
+        } else if (r.endTableId === dragging - 1) {
+          return {
+            ...r,
+            endX: props.tables[r.endTableId].x + 15,
+            endY: props.tables[r.endTableId].y + r.endFieldId * 36 + 40 + 19,
+          };
+        }
+        return r;
+      });
+      setRelationships(updatedRelationShips);
     }
   };
 
@@ -119,10 +142,11 @@ export default function Canvas(props) {
     setRelationships((prev) => [
       ...prev,
       {
-        startX: line.startX,
-        startY: line.startY,
+        ...line,
         endX: props.tables[onRect.tableId].x + 15,
         endY: props.tables[onRect.tableId].y + onRect.field * 36 + 40 + 19,
+        endTableId: onRect.tableId,
+        endFieldId: onRect.field,
       },
     ]);
   };
@@ -229,8 +253,9 @@ export default function Canvas(props) {
               strokeDasharray="5,5"
             />
           )}
-          {relationships.map((e) => (
+          {relationships.map((e, i) => (
             <line
+              key={i}
               x1={e.startX}
               y1={e.startY}
               x2={e.endX}
diff --git a/src/components/editor_panel.jsx b/src/components/editor_panel.jsx
index f1b9258..489d2e9 100644
--- a/src/components/editor_panel.jsx
+++ b/src/components/editor_panel.jsx
@@ -67,7 +67,6 @@ export default function EditorPanel(props) {
             };
             props.setTables(prev => {
               const updatedTables = [...prev, newTable];
-              console.log(updatedTables);
               return updatedTables;
             });
             props.setCode((prev) =>
diff --git a/src/components/table.jsx b/src/components/table.jsx
index 11da960..8c27ba1 100644
--- a/src/components/table.jsx
+++ b/src/components/table.jsx
@@ -226,12 +226,15 @@ export default function Table(props) {
                       className={`w-[10px] h-[10px] bg-green-600 rounded-full me-2`}
                       onMouseDown={(ev) => {
                         props.handleGripField(i);
-                        props.setLine({
+                        props.setLine((prev)=>({
+                          ...prev,
+                          startFieldId: i,
+                          startTableId: props.id,
                           startX: props.tableData.x + 15,
                           startY: props.tableData.y + i * 36 + 40 + 19,
                           endX: props.tableData.x + 15,
                           endY: props.tableData.y + i * 36 + 40 + 19,
-                        });
+                        }));
                       }}
                     ></button>
                     {e.name}