diff --git a/client/src/App.js b/client/src/App.js
index cb1ce4c..e9c0316 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,243 +1,38 @@
 import React, { useEffect, useState, useRef } from "react";
-import Peer from "simple-peer";
 import io from "socket.io-client";
 import Form from "./components/Form";
 import Listen from "./components/Listen";
 import CarouselSliders from "./components/CarouselSliders";
 import AnimatedNumber from "react-animated-numbers";
-import { FaMasksTheater, FaMicrophoneLines } from "react-icons/fa6";
+import { FaMicrophoneLines } from "react-icons/fa6";
 import { LiaLaptopSolid } from "react-icons/lia";
 import { ToastContainer, toast, Slide } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
 import { MediaRecorder, register } from "extendable-media-recorder";
 import { connect } from "extendable-media-recorder-wav-encoder";
 
-// const socket = io.connect('http://localhost:5000/');
 var socket = io("http://localhost:5000/");
 
 function App() {
-  const [offer, setOffer] = useState();
   const [stream, setStream] = useState();
   const [matches, setMatches] = useState([]);
   const [totalSongs, setTotalSongs] = useState(10);
   const [isListening, setisListening] = useState(false);
   const [audioInput, setAudioInput] = useState("device");
-  const [peerConnection, setPeerConnection] = useState();
-  const [serverEngaged, setServerEngaged] = useState(false);
+  const [registeredMediaEncoder, setRegisteredMediaEncoder] = useState(false);
 
   const streamRef = useRef(stream);
-  // const serverEngagedRef = useRef(serverEngaged);
-  const peerConnectionRef = useRef(peerConnection);
-
-  async function record1() {
-    const mediaDevice =
-      audioInput == "device"
-        ? navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices)
-        : navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
-
-    await register(await connect());
-
-    const stream = await mediaDevice({ audio: true });
-    const audioTracks = stream.getAudioTracks();
-    const audioStream = new MediaStream(audioTracks);
-
-    for (const track of stream.getVideoTracks()) {
-      track.stop();
-    }
-
-    const mediaRecorder = new MediaRecorder(audioStream, {
-      mimeType: "audio/wav",
-    });
-
-    const chunks = [];
-    mediaRecorder.ondataavailable = function (e) {
-      chunks.push(e.data);
-    };
-
-    mediaRecorder.addEventListener("stop", () => {
-      const blob = new Blob(chunks, { type: "audio/wav" });
-      const reader = new FileReader();
-      reader.readAsArrayBuffer(blob);
-
-      reader.onload = (event) => {
-        const arrayBuffer = event.target.result;
-
-        var binary = "";
-        var bytes = new Uint8Array(arrayBuffer);
-        var len = bytes.byteLength;
-        for (var i = 0; i < len; i++) {
-          binary += String.fromCharCode(bytes[i]);
-        }
-
-        // Convert byte array to base64
-        const base64data = btoa(binary);
-
-        socket.emit("blob", base64data);
-      };
-    });
-
-    mediaRecorder.start();
-
-    // Stop recording after 15 seconds
-    setTimeout(function () {
-      mediaRecorder.stop();
-    }, 15000);
-  }
-
-  function record() {
-    const mediaDevice =
-      audioInput == "device"
-        ? navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices)
-        : navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
-
-    mediaDevice({ audio: true })
-      .then(function (stream) {
-        const audioTracks = stream.getAudioTracks();
-        const audioStream = new MediaStream(audioTracks);
-
-        for (const track of stream.getVideoTracks()) {
-          track.stop();
-        }
-
-        const mediaRecorder = new MediaRecorder(audioStream);
-        const chunks = [];
-
-        mediaRecorder.ondataavailable = function (e) {
-          chunks.push(e.data);
-          console.log("DataType: ", e.data);
-          // if (e.data.type.startsWith("audio")) {
-          //   chunks.push(e.data);
-          // }
-        };
-
-        mediaRecorder.addEventListener("stop", () => {
-          const blob = new Blob(chunks, { type: "audio/mpeg" }); // Assuming MP3 format
-
-          // Convert Blob to byte array
-          const reader = new FileReader();
-          reader.readAsArrayBuffer(blob);
-
-          reader.onloadend = () => {
-            if (reader.result) {
-              var binary = "";
-              var bytes = new Uint8Array(reader.result);
-              var len = bytes.byteLength;
-              for (var i = 0; i < len; i++) {
-                binary += String.fromCharCode(bytes[i]);
-              }
-
-              // Convert byte array to base64
-              const base64data = btoa(binary);
-
-              console.log("Base64:", base64data);
-              // Send the base64 data to the backend (assuming socket.emit exists)
-              socket.emit("blob", base64data);
-            } else {
-              console.error("Error reading Blob as array buffer");
-            }
-          };
-        });
-        // Start recording
-        mediaRecorder.start();
-
-        // Stop recording after 5 seconds
-        setTimeout(function () {
-          mediaRecorder.stop();
-        }, 15000);
-      })
-      .catch(function (err) {
-        console.error("Error accessing media devices.", err);
-      });
-  }
-
-  function cleanUp() {
-    const currentStream = streamRef.current;
-    if (currentStream) {
-      console.log("Cleaning tracks");
-      currentStream.getTracks().forEach((track) => track.stop());
-    }
-    setStream(null);
-    setisListening(false);
-    console.log("Cleanup complete.");
-  }
-
-  function createPeerConnection() {
-    const peer = new Peer({
-      initiator: true,
-      trickle: false,
-      stream: null,
-    });
-
-    // Handle peer events:
-    peer.on("signal", (offerData) => {
-      console.log("Offer generated");
-      setOffer(JSON.stringify(offerData));
-      setPeerConnection(peer);
-    });
-
-    peer.on("close", () => {
-      cleanUp();
-      setServerEngaged(false);
-      console.log("CONNECTION CLOSED");
-    });
-
-    peer.on("error", (err) => {
-      console.error("An error occurred:", err);
-    });
-  }
+  let sendRecordingRef = useRef(true);
 
   useEffect(() => {
     streamRef.current = stream;
-    peerConnectionRef.current = peerConnection;
-  }, [stream, peerConnection]);
-
-  useEffect(() => {
-    if (offer) {
-      console.log("Sending Offer");
-      let offerEncoded = btoa(offer);
-      socket.emit("engage", offerEncoded);
-
-      socket.on("serverEngaged", (answer) => {
-        console.log("Received answer");
-        let decodedAnswer = atob(answer);
-        if (!serverEngaged && !stream && !peerConnection.destroyed) {
-          peerConnection.signal(decodedAnswer);
-        }
-        console.log("Engaged Server");
-        setServerEngaged(true);
-      });
-    }
-  }, [offer]);
+  }, [stream]);
 
   useEffect(() => {
     socket.on("connect", () => {
-      createPeerConnection();
       socket.emit("totalSongs", "");
     });
 
-    // socket.on("serverEngaged", (answer) => {
-    //   console.log("Received answer");
-
-    //   let decodedAnswer = atob(answer);
-
-    //   if (
-    //     !serverEngagedRef.current &&
-    //     !streamRef.current &&
-    //     !peerConnectionRef.current.destroyed
-    //   ) {
-    //     console.log("Adding answer");
-    //     peerConnectionRef.current.signal(decodedAnswer);
-    //   }
-
-    //   console.log("Engaged Server");
-    //   setServerEngaged(true);
-    // });
-
-    socket.on("failedToEngage", () => {
-      console.log("Server failed to engage");
-      stopListening();
-    });
-
     socket.on("matches", (matches) => {
       matches = JSON.parse(matches);
       if (matches) {
@@ -245,14 +40,12 @@ function App() {
         console.log("Matches: ", matches);
       } else {
         toast("No song found.");
-        console.log("No Matches");
       }
 
       cleanUp();
     });
 
     socket.on("downloadStatus", (msg) => {
-      console.log("downloadStatus: ", msg);
       msg = JSON.parse(msg);
       const msgTypes = ["info", "success", "error"];
       if (msg.type !== undefined && msgTypes.includes(msg.type)) {
@@ -263,7 +56,6 @@ function App() {
     });
 
     socket.on("totalSongs", (songsCount) => {
-      console.log("Total songs in DB: ", songsCount);
       setTotalSongs(songsCount);
     });
   }, []);
@@ -278,63 +70,150 @@ function App() {
     return () => clearInterval(intervalId);
   }, []);
 
-  function stopListening() {
-    console.log("Pause Clicked");
-    cleanUp();
-    peerConnectionRef.current.destroy();
+  async function record() {
+    try {
+      const mediaDevice =
+        audioInput === "device"
+          ? navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices)
+          : navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
 
-    setTimeout(() => {
-      createPeerConnection();
-    }, 3);
-  }
+      if (!registeredMediaEncoder) {
+        await register(await connect());
+        setRegisteredMediaEncoder(true);
+      }
 
-  function startListening() {
-    const mediaDevice =
-      audioInput === "device"
-        ? navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices)
-        : navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+      const constraints = {
+        audio: {
+          autoGainControl: false,
+          channelCount: 1,
+          echoCancellation: true,
+          noiseSuppression: true,
+          sampleSize: 16,
+        },
+      };
 
-    mediaDevice({ audio: true })
-      .then((stream) => {
-        console.log("isListening: ", isListening);
-        peerConnection.addStream(stream);
-        setisListening(true);
+      const stream = await mediaDevice(constraints);
+      const audioTracks = stream.getAudioTracks();
+      const audioStream = new MediaStream(audioTracks);
 
-        setStream(stream);
-        stream.getAudioTracks()[0].onended = stopListening;
-      })
-      .catch((error) => {
-        console.error("Error accessing user media:", error);
+      setStream(audioStream);
+      audioTracks[0].onended = stopListening;
+
+      // Stop video tracks
+      for (const track of stream.getVideoTracks()) {
+        track.stop();
+      }
+
+      const mediaRecorder = new MediaRecorder(audioStream, {
+        mimeType: "audio/wav",
       });
+
+      mediaRecorder.start();
+      setisListening(true);
+      sendRecordingRef.current = true;
+
+      const chunks = [];
+      mediaRecorder.ondataavailable = function (e) {
+        chunks.push(e.data);
+      };
+
+      // Stop recording after 15 seconds
+      setTimeout(function () {
+        mediaRecorder.stop();
+      }, 15000);
+
+      mediaRecorder.addEventListener("stop", () => {
+        const blob = new Blob(chunks, { type: "audio/wav" });
+        const reader = new FileReader();
+        reader.readAsArrayBuffer(blob);
+
+        // downloadRecord(blob);
+
+        reader.onload = (event) => {
+          const arrayBuffer = event.target.result;
+
+          var binary = "";
+          var bytes = new Uint8Array(arrayBuffer);
+          var len = bytes.byteLength;
+          for (var i = 0; i < len; i++) {
+            binary += String.fromCharCode(bytes[i]);
+          }
+
+          // Convert byte array to base64
+          const rawAudio = btoa(binary);
+          const audioConfig = audioStream.getAudioTracks()[0].getSettings();
+
+          const recordData = {
+            audio: rawAudio,
+            channels: audioConfig.channelCount,
+            sampleRate: audioConfig.sampleRate,
+            sampleSize: audioConfig.sampleSize,
+          };
+
+          if (sendRecordingRef.current) {
+            socket.emit("record", JSON.stringify(recordData));
+          }
+        };
+      });
+    } catch (error) {
+      console.error("error:", error);
+      // Handle errors gracefully
+    }
   }
 
-  const handleLaptopIconClick = () => {
-    console.log("Laptop icon clicked");
-    setAudioInput("device");
-  };
+  function downloadRecord(blob) {
+    const blobUrl = URL.createObjectURL(blob);
 
-  const handleMicrophoneIconClick = () => {
-    console.log("Microphone icon clicked");
+    // Create a download link
+    const downloadLink = document.createElement("a");
+    downloadLink.href = blobUrl;
+    downloadLink.download = "recorded_audio.wav";
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+  }
+
+  function cleanUp() {
+    const currentStream = streamRef.current;
+    if (currentStream) {
+      currentStream.getTracks().forEach((track) => track.stop());
+    }
+
+    setStream(null);
+    setisListening(false);
+  }
+
+  function stopListening() {
+    sendRecordingRef.current = false;
+    cleanUp();
+  }
+
+  function handleLaptopIconClick() {
+    setAudioInput("device");
+  }
+
+  function handleMicrophoneIconClick() {
     setAudioInput("mic");
-  };
+  }
 
   return (
     <div className="App">
-      <h1>New App</h1>
-      <h4 style={{ display: "flex", justifyContent: "flex-end" }}>
-        <AnimatedNumber
-          includeComma
-          animateToNumber={totalSongs}
-          config={{ tension: 89, friction: 40 }}
-          animationType={"calm"}
-        />
-        &nbsp;Songs
-      </h4>
+      <div className="TopHeader">
+        <h1 style={{ color: "#374151" }}>!Shazam</h1>
+        <h4 style={{ display: "flex", justifyContent: "flex-end" }}>
+          <AnimatedNumber
+            includeComma
+            animateToNumber={totalSongs}
+            config={{ tension: 89, friction: 40 }}
+            animationType={"calm"}
+          />
+          &nbsp;Songs
+        </h4>
+      </div>
       <div className="listen">
         <Listen
           stopListening={stopListening}
-          disable={!serverEngaged}
-          startListening={record1}
+          disable={false}
+          startListening={record}
           isListening={isListening}
         />
       </div>
@@ -367,7 +246,7 @@ function App() {
       <ToastContainer
         position="top-center"
         autoClose={5000}
-        hideProgressBar={false}
+        hideProgressBar={true}
         newestOnTop={false}
         closeOnClick
         rtl={false}