diff --git a/routes/(apps)/mobility/api/insert_mobility.ts b/routes/(apps)/mobility/api/insert_mobility.ts
index 2d5b3f9..ec9048e 100644
--- a/routes/(apps)/mobility/api/insert_mobility.ts
+++ b/routes/(apps)/mobility/api/insert_mobility.ts
@@ -1,12 +1,12 @@
 import { Handlers } from "$fresh/server.ts";
-import connect from "$root/databases/connect.ts";
+import { Database } from "@db/sqlite";
 
 export const handler: Handlers = {
   async GET() {
     try {
-      using connection = connect("mobility");
+      const connection = new Database("databases/data/mobility.db", { create: false });
 
-      const mobilities = connection.database.prepare(
+      const mobilities = connection.prepare(
         `SELECT 
           mobility.id, 
           mobility.studentId, 
@@ -19,9 +19,11 @@ export const handler: Handlers = {
           mobility.destinationName, 
           mobility.mobilityStatus 
         FROM mobility
-        LEFT JOIN students ON mobility.studentId = students.userId`,
+        LEFT JOIN students ON mobility.studentId = students.userId`
       ).all();
 
+      connection.close();
+
       return new Response(
         JSON.stringify({ mobilities }),
         {
@@ -36,7 +38,7 @@ export const handler: Handlers = {
   },
 
   async POST(request) {
-    console.log("API /mobility/api/update_mobility called");
+    console.log("API /mobility/api/insert_mobility called");
 
     try {
       const body = await request.json();
@@ -46,25 +48,17 @@ export const handler: Handlers = {
         throw new Error("Invalid request body");
       }
 
-      using connection = connect("mobility");
+      const connection = new Database("databases/data/mobility.db", { create: false });
 
-      const updateQuery = connection.database.prepare(
+      const insertQuery = connection.prepare(
         `INSERT INTO mobility (
-          id, studentId, startDate, endDate, weeksCount, destinationCountry, destinationName, mobilityStatus
+          studentId, startDate, endDate, weeksCount, destinationCountry, destinationName, mobilityStatus
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT(id) DO UPDATE SET
-          startDate = excluded.startDate,
-          endDate = excluded.endDate,
-          weeksCount = excluded.weeksCount,
-          destinationCountry = excluded.destinationCountry,
-          destinationName = excluded.destinationName,
-          mobilityStatus = excluded.mobilityStatus`
+        VALUES (?, ?, ?, ?, ?, ?, ?)`
       );
 
       for (const mobility of data) {
         const {
-          id,
           studentId,
           startDate,
           endDate,
@@ -74,8 +68,7 @@ export const handler: Handlers = {
           mobilityStatus = "N/A",
         } = mobility;
 
-        updateQuery.run(
-          id,
+        insertQuery.run(
           studentId,
           startDate,
           endDate,
@@ -86,11 +79,13 @@ export const handler: Handlers = {
         );
       }
 
-      console.log("Mobility data updated successfully");
-      return new Response("Data updated successfully", { status: 200 });
+      connection.close();
+
+      console.log("Mobility data inserted successfully");
+      return new Response("Data inserted successfully", { status: 201 });
     } catch (error) {
-      console.error("Error updating mobility data:", error);
-      return new Response("Failed to update data", { status: 500 });
+      console.error("Error inserting mobility data:", error);
+      return new Response("Failed to insert data", { status: 500 });
     }
   },
 };
diff --git a/routes/(apps)/mobility/api/insert_students_test.ts b/routes/(apps)/mobility/api/insert_students_test.ts
deleted file mode 100644
index d0123af..0000000
--- a/routes/(apps)/mobility/api/insert_students_test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Handlers } from "$fresh/server.ts";
-import connect from "$root/databases/connect.ts";
-
-export const handler: Handlers = {
-  async GET() {
-    try {
-      using connection = connect("students");
-
-      const promotions = connection.database.prepare(
-        "select id from promotions",
-      ).all();
-
-      const students = connection.database
-        .prepare(
-          `select userId, firstName, lastName, mail, promotionId from students`,
-        )
-        .all();
-
-      return new Response(
-        JSON.stringify({ promotions, students }),
-        {
-          status: 200,
-          headers: { "Content-Type": "application/json" },
-        },
-      );
-    } catch (error) {
-      console.error("Error fetching data:", error);
-      return new Response("Failed to fetch data", { status: 500 });
-    }
-  },
-};