diff --git a/app.js b/app.js
index fbe9779..d632473 100644
--- a/app.js
+++ b/app.js
@@ -8,7 +8,8 @@ import Hyperdrive from 'hyperdrive';
 import Corestore from 'corestore';
 import { EventEmitter } from 'events';
 
-const store = new Corestore('./storage');
+const storagePath = `./storage_${Date.now()}_${Math.random().toString(36).substring(2, 15)}`;
+const store = new Corestore(storagePath);
 const drive = new Hyperdrive(store);
 
 await drive.ready();
@@ -21,10 +22,18 @@ let peerCount = 0;
 let currentRoom = null;
 const eventEmitter = new EventEmitter();
 
+// Define servePort at the top level
+let servePort;
+
+// Function to get a random port between 1337 and 2223
+function getRandomPort() {
+  return Math.floor(Math.random() * (2223 - 1337 + 1)) + 1337;
+}
+
 async function initialize() {
   swarm = new Hyperswarm();
 
-  const servePort = 1337;
+  servePort = getRandomPort();
   const serve = new ServeDrive({ port: servePort, get: ({ key, filename, version }) => drive });
   await serve.ready();
   console.log('Listening on http://localhost:' + serve.address().port);
@@ -129,7 +138,7 @@ function registerUser(e) {
     reader.onload = async (event) => {
       const buffer = new Uint8Array(event.target.result);
       await drive.put(`/icons/${regUsername}.png`, buffer);
-      userAvatar = `http://localhost:1337/icons/${regUsername}.png`; // Set the correct URL
+      userAvatar = `http://localhost:${servePort}/icons/${regUsername}.png`; // Set the correct URL
       registeredUsers[regUsername] = userAvatar;
       localStorage.setItem('registeredUsers', JSON.stringify(registeredUsers));
       continueRegistration(regUsername);