diff --git a/prod.out b/prod.out
index 892d018..ae57ce3 100644
Binary files a/prod.out and b/prod.out differ
diff --git a/server/dist/index.js b/server/dist/index.js
index 5f40ff8..bb6c972 100644
--- a/server/dist/index.js
+++ b/server/dist/index.js
@@ -15,7 +15,7 @@ import { syncUserData, captureNowPlaying } from './lib/sync.js';
 const app = express();
 app.use(helmet());
 app.use(cors({ origin: [
-        'http://localhost:3000',
+        'http://localhost:4000',
         'https://159.195.9.107:3443',
         'http://159.195.9.107:3443'
     ], credentials: true }));
diff --git a/server/dist/routes/users.js b/server/dist/routes/users.js
index 3ddd1ab..7b58d92 100644
--- a/server/dist/routes/users.js
+++ b/server/dist/routes/users.js
@@ -70,7 +70,7 @@ usersRouter.get('/:uid/now-playing', requireAuth, async (req, res) => {
             return res.status(403).json({ error: 'Forbidden' });
         if (req.user.uid !== uid) {
             // allow if users are partnered
-            const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user1_id=? AND user2_id=?) OR (user1_id=? AND user2_id=?)').get(req.user.uid, uid, uid, req.user.uid);
+            const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user_a_id=? AND user_b_id=?) OR (user_a_id=? AND user_b_id=?)').get(req.user.uid, uid, uid, req.user.uid);
             if (!paired)
                 return res.status(403).json({ error: 'Forbidden' });
         }
@@ -108,7 +108,7 @@ usersRouter.get('/:uid/audio-features', requireAuth, async (req, res) => {
         if (!req.user)
             return res.status(403).json({ error: 'Forbidden' });
         if (req.user.uid !== uid) {
-            const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user1_id=? AND user2_id=?) OR (user1_id=? AND user2_id=?)').get(req.user.uid, uid, uid, req.user.uid);
+            const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user_a_id=? AND user_b_id=?) OR (user_a_id=? AND user_b_id=?)').get(req.user.uid, uid, uid, req.user.uid);
             if (!paired)
                 return res.status(403).json({ error: 'Forbidden' });
         }
diff --git a/server/src/index.ts b/server/src/index.ts
index 8f811a2..ee705b6 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -17,7 +17,7 @@ const app = express();
 
 app.use(helmet());
 app.use(cors({ origin: [
-  'http://localhost:3000',
+  'http://localhost:4000',
   'https://159.195.9.107:3443',
   'http://159.195.9.107:3443'
 ], credentials: true }));
diff --git a/server/src/routes/users.ts b/server/src/routes/users.ts
index af51acc..1762a5e 100644
--- a/server/src/routes/users.ts
+++ b/server/src/routes/users.ts
@@ -74,7 +74,7 @@ usersRouter.get('/:uid/now-playing', requireAuth, async (req: AuthedRequest, res
     if (!req.user) return res.status(403).json({ error: 'Forbidden' });
     if (req.user.uid !== uid) {
       // allow if users are partnered
-      const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user1_id=? AND user2_id=?) OR (user1_id=? AND user2_id=?)').get(req.user.uid, uid, uid, req.user.uid);
+      const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user_a_id=? AND user_b_id=?) OR (user_a_id=? AND user_b_id=?)').get(req.user.uid, uid, uid, req.user.uid);
       if (!paired) return res.status(403).json({ error: 'Forbidden' });
     }
   // Try DB-captured snapshot first (last 60s)
@@ -108,7 +108,7 @@ usersRouter.get('/:uid/audio-features', requireAuth, async (req: AuthedRequest,
     const ids = String(req.query.ids || '').split(',').map(s => s.trim()).filter(Boolean);
     if (!req.user) return res.status(403).json({ error: 'Forbidden' });
     if (req.user.uid !== uid) {
-      const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user1_id=? AND user2_id=?) OR (user1_id=? AND user2_id=?)').get(req.user.uid, uid, uid, req.user.uid);
+      const paired = db.db.prepare('SELECT 1 FROM friendships WHERE (user_a_id=? AND user_b_id=?) OR (user_a_id=? AND user_b_id=?)').get(req.user.uid, uid, uid, req.user.uid);
       if (!paired) return res.status(403).json({ error: 'Forbidden' });
     }
     if (!ids.length) return res.json({ audio_features: [] });
diff --git a/spotify.db b/spotify.db
index 9454a2a..c75adbc 100644
Binary files a/spotify.db and b/spotify.db differ
diff --git a/spotify.db-shm b/spotify.db-shm
index 65439a8..cb78dbb 100644
Binary files a/spotify.db-shm and b/spotify.db-shm differ
diff --git a/spotify.db-wal b/spotify.db-wal
index 6302c34..c2528a1 100644
Binary files a/spotify.db-wal and b/spotify.db-wal differ
diff --git a/vite.config.ts b/vite.config.ts
index 6a96e3e..ec5eab3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,7 +5,7 @@ import react from '@vitejs/plugin-react'
 export default defineConfig({
   plugins: [react()],
   server: {
-    port: 3000,
+    port: 4000,
     host: true
   }
 })