diff --git a/src/lib/server/db/schema.js b/src/lib/server/db/schema.js
index 9e7680e..e048caa 100644
--- a/src/lib/server/db/schema.js
+++ b/src/lib/server/db/schema.js
@@ -34,7 +34,7 @@ export const sensors = pgTable("sensors", {
 });
 
 export const sensorData = pgTable("sensor_data", {
-  uuid: uuid().primaryKey(),
+  uuid: uuid().primaryKey().defaultRandom(),
   sensor: text("sensor")
     .references(() => sensors.id)
     .notNull(),
@@ -42,5 +42,5 @@ export const sensorData = pgTable("sensor_data", {
   humidity: real().notNull(),
   pressure: real().notNull(),
   altitude: real().notNull(),
-  time: timestamp().notNull().defaultNow(),
+  time: timestamp({ withTimezone: true, mode: "date" }).notNull().defaultNow(),
 });
diff --git a/src/routes/(app)/[slug]/+page.svelte b/src/routes/(app)/[slug]/+page.svelte
index e31f282..5be7cd3 100644
--- a/src/routes/(app)/[slug]/+page.svelte
+++ b/src/routes/(app)/[slug]/+page.svelte
@@ -136,16 +136,7 @@
   import { cubicInOut } from "svelte/easing";
   import { ChevronDownIcon, Columns2 } from "@lucide/svelte";
 
-  let chartData = $state([
-    { date: new Date("2024-04-01"), desktop: 222, mobile: 150 },
-    { date: new Date("2024-04-02"), desktop: 97, mobile: 180 },
-    { date: new Date("2024-04-03"), desktop: 167, mobile: 120 },
-    { date: new Date("2024-04-04"), desktop: 242, mobile: 260 },
-    { date: new Date("2024-06-27"), desktop: 448, mobile: 490 },
-    { date: new Date("2024-06-28"), desktop: 149, mobile: 200 },
-    { date: new Date("2024-06-29"), desktop: 103, mobile: 160 },
-    { date: new Date("2024-06-30"), desktop: 446, mobile: 400 },
-  ]);
+  let chartData = $state([]);
 
   let timeRange = $state("90d");
 
@@ -194,7 +185,9 @@
       const number = await response.json();
       console.log(number);
 
-      chartData = [];
+      chartData = number.map((obj) => {
+        return { date: new Date(obj.date), desktop: obj.temp, mobile: obj.pressure };
+      });
     }
   });
 </script>
diff --git a/src/routes/(app)/[slug]/stats/+server.ts b/src/routes/(app)/[slug]/stats/+server.ts
index 6356340..a719178 100644
--- a/src/routes/(app)/[slug]/stats/+server.ts
+++ b/src/routes/(app)/[slug]/stats/+server.ts
@@ -2,7 +2,7 @@ import { db } from "$lib/server/db";
 import * as table from "$lib/server/db/schema"
 
 export const GET = async () => {
-  const data = await db.select({ sensor: table.sensorData.sensor }).from(table.sensorData);
+  const data = await db.select({ date: table.sensorData.time, temp: table.sensorData.temperature, pressure: table.sensorData.pressure }).from(table.sensorData);
   console.log(data);
 
   return new Response(JSON.stringify(data), {
diff --git a/src/routes/(app)/settings/+page.server.js b/src/routes/(app)/settings/+page.server.js
index e7bdcb0..1939028 100644
--- a/src/routes/(app)/settings/+page.server.js
+++ b/src/routes/(app)/settings/+page.server.js
@@ -81,6 +81,9 @@ export const actions = {
 
     try {
       const deviceData = JSON.parse(devices);
+      deviceData.forEach(async (dev) => {
+        await db.insert(table.sensors).values({ id: dev.id, user: event.locals.session.userId });
+      });
 
       // Check if floor exists
       const exists = await db
diff --git a/src/routes/mqtt/+server.js b/src/routes/mqtt/+server.js
index be1d000..75ae0aa 100644
--- a/src/routes/mqtt/+server.js
+++ b/src/routes/mqtt/+server.js
@@ -1,5 +1,8 @@
 // src/routes/mqtt/+server.js
+import { db } from "$lib/server/db";
+import * as table from "$lib/server/db/schema";
 import { connectedDevices, deviceSensorData, getCurrentDevices } from "$lib/server/mqtt-devices.js";
+import { eq } from "drizzle-orm";
 import mqtt from "mqtt";
 import { writable } from "svelte/store";
 
@@ -114,7 +117,7 @@ function connectMqtt() {
     });
   });
 
-  client.on("message", (topic, message) => {
+  client.on("message", async (topic, message) => {
     const payload = message.toString();
     console.log(`Received message from topic "${topic}": ${payload}`);
     latestMessage.set(payload); // Update the Svelte store
@@ -130,6 +133,17 @@ function connectMqtt() {
       if (sensorData) {
         console.log(`Parsed sensor data:`, sensorData);
         updateDevice(deviceId, sensorData);
+        const devices = await db.select().from(table.sensors).where(eq(table.sensors.id, deviceId));
+        if (devices.length == 1)
+          await db
+            .insert(table.sensorData)
+            .values({
+              sensor: deviceId,
+              temperature: sensorData.temperature,
+              humidity: sensorData.humidity,
+              altitude: sensorData.altitude,
+              pressure: sensorData.pressure,
+            });
       } else {
         // Still update device as online even if data parsing failed
         updateDevice(deviceId);