diff --git a/schema.graphql b/schema.graphql
index 0b1c17f..ce6dc98 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -414,6 +414,11 @@ type PreExam {
   zpaExam: ZPAExam!
 }
 
+type PrePlannedRoom {
+  ancode: Int!
+  roomName: String!
+}
+
 type PrimussExam {
   ancode: Int!
   examType: String!
diff --git a/src/lib/nta/NTACard.svelte b/src/lib/nta/NTACard.svelte
index 4b7f5d8..d22497f 100644
--- a/src/lib/nta/NTACard.svelte
+++ b/src/lib/nta/NTACard.svelte
@@ -6,7 +6,7 @@
 	<div class="card-body">
 		<div class="flex justify-between">
 			<span class="text-xl text-green-900">
-				{nta.nta.name} ({nta.nta.program})
+				{nta.nta.name} ({nta.nta.program} / {nta.nta.mtknr})
 			</span>
 			{#if nta.nta.needsHardware}
 				<div class="badge badge-info">spezielle Hardware</div>
diff --git a/src/routes/rooms/+page.server.gql b/src/routes/rooms/+page.server.gql
deleted file mode 100644
index ee9c0a0..0000000
--- a/src/routes/rooms/+page.server.gql
+++ /dev/null
@@ -1,26 +0,0 @@
-query Rooms {
-	rooms {
-		name
-		seats
-		handicap
-		lab
-		placesWithSocket
-		exahm
-		seb
-		needsRequest
-	}
-	roomsForSlots {
-		day
-		slot
-		rooms {
-			name
-			seats
-			handicap
-			lab
-			placesWithSocket
-			exahm
-			seb
-			needsRequest
-		}
-	}
-}
diff --git a/src/routes/rooms/+page.server.ts b/src/routes/rooms/+page.server.ts
new file mode 100644
index 0000000..6ae0cbd
--- /dev/null
+++ b/src/routes/rooms/+page.server.ts
@@ -0,0 +1,27 @@
+import { env } from '$env/dynamic/private';
+import { request, gql } from 'graphql-request';
+
+export async function load() {
+	const query = gql`
+		query {
+			rooms {
+				name
+				seats
+				handicap
+				lab
+				placesWithSocket
+				exahm
+				seb
+				needsRequest
+			}
+		}
+	`;
+
+	let data = await request(env.PLEXAMS_SERVER, query);
+
+	console.log('Rooms data:', data);
+
+	return {
+		rooms: data.rooms
+	};
+}
diff --git a/src/routes/rooms/+page.svelte b/src/routes/rooms/+page.svelte
index d08356b..ce3892c 100644
--- a/src/routes/rooms/+page.svelte
+++ b/src/routes/rooms/+page.svelte
@@ -1,40 +1,34 @@
-<script lang="ts">
-	import type { PageData } from './$houdini';
-	export let data: PageData;
+<script>
+	export let data;
 
-	$: ({ Rooms } = data);
+	let rooms = data.rooms;
 
-	let rooms: any = [];
-	$: rooms = $Rooms?.data?.rooms || [];
-
-	function onClick(column: any) {
+	function onClick(column) {
 		if (column === 'nta') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.handicap);
+			rooms = data.rooms.filter((r) => r.handicap);
 		} else if (column === 'lab') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.lab);
+			rooms = data.rooms.filter((r) => r.lab);
 		} else if (column === 'placesWithSocket') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.placesWithSocket);
+			rooms = data.rooms.filter((r) => r.placesWithSocket);
 		} else if (column === 'exahm') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.exahm);
+			rooms = data.rooms.filter((r) => r.exahm);
 		} else if (column === 'seb') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.seb);
+			rooms = data.rooms.filter((r) => r.seb);
 		} else if (column === 'needsRequest') {
-			rooms = $Rooms?.data?.rooms.filter((r) => r.needsRequest);
+			rooms = data.rooms.filter((r) => r.needsRequest);
 		} else if (column === 'seats') {
-			rooms = $Rooms?.data?.rooms;
-			rooms?.sort((r1: any, r2: any) => r2.seats - r1.seats);
+			rooms = data.rooms;
+			rooms.sort((r1, r2) => r2.seats - r1.seats);
 		} else if (column === 'name') {
-			rooms = $Rooms?.data?.rooms;
-			rooms?.sort((r1: any, r2: any) => r1.name.localeCompare(r2.name));
+			rooms = data.rooms;
+			rooms.sort((r1, r2) => r1.name.localeCompare(r2.name));
 		}
 	}
-
-	let roomsForSlots = $Rooms?.data?.roomsForSlots || [];
 </script>
 
 <div class="text-center m-2">
 	<div class="text-4xl text-center mt-8 uppercase">
-		{rooms.length} Räume
+		{data.rooms.length} Räume
 	</div>
 </div>