diff --git a/Calculator/jashkarangiya/index.html b/Calculator/jashkarangiya/index.html
index 84a9c6491..5512469ea 100644
--- a/Calculator/jashkarangiya/index.html
+++ b/Calculator/jashkarangiya/index.html
@@ -24,9 +24,12 @@
                 <table>
                     <tr>
                         <td><button class="btn-operator" id="clear">C</button></td>
-                        <td><button class="btn-operator" id="/">&divide;</button></td>
-                        <td><button class="btn-operator" id="*">&times;</button></td>
-                        <td><button class="btn-operator" id="backspace"><</button></td>
+                        <td><button class="btn-operator" id="/">/</button></td>
+                        <!-- <td><button class="btn-operator" id="*">&times;</button></td> -->
+                        <td><button class="btn-operator" id="*">*</button></td>
+                        <td><button class="btn-operator" id="backspace">
+                                < </button>
+                        </td>
                     </tr>
                     <tr>
                         <td><button class="btn-number" id="7">7</button></td>
diff --git a/Calculator/jashkarangiya/js/index.js b/Calculator/jashkarangiya/js/index.js
index 82ba2fa30..9e81c282f 100644
--- a/Calculator/jashkarangiya/js/index.js
+++ b/Calculator/jashkarangiya/js/index.js
@@ -2,21 +2,40 @@ const display = document.querySelector("#display");
 const buttons = document.querySelectorAll("button");
 
 buttons.forEach((item) => {
-    item.onclick = () => {
-        if (item.id == "clear") {
-            display.innerText = "";
-        } else if (item.id == "backspace") {
-            let string = display.innerText.toString();
-            display.innerText = string.substr(0, string.length - 1);
-        } else if (display.innerText != "" && item.id == "equal") {
-            display.innerText = eval(display.innerText);
-        } else if (display.innerText == "" && item.id == "equal") {
-            display.innerText = "Empty!";
-            setTimeout(() => (display.innerText = ""), 2000);
-        } else {
-            display.innerText += item.id;
+  item.onclick = () => {
+    if (item.id == "clear") {
+      display.innerText = "";
+    } else if (item.id == "backspace") {
+      let string = display.innerText.toString();
+      display.innerText = string.substr(0, string.length - 1);
+    } else if (display.innerText != "" && item.id == "equal") {
+      try {
+        if (display.innerText.includes("/0")) {
+          throw new Error("Division by zero");
         }
-    };
+        display.innerText = Function(
+          '"use strict";return (' + display.innerText + ")"
+        )();
+      } catch (e) {
+        display.innerText = "Cannot divide by zero!";
+        setTimeout(() => (display.innerText = ""), 2000);
+      }
+    } else if (display.innerText == "" && item.id == "equal") {
+      display.innerText = "Empty!";
+      setTimeout(() => (display.innerText = ""), 2000);
+    } else {
+      const lastChar = display.innerText.slice(-1);
+      if (
+        ["+", "-", "*", "/"].includes(lastChar) &&
+        ["+", "-", "*", "/"].includes(item.innerText)
+      ) {
+        // Prevent adding multiple consecutive operators
+        display.innerText = display.innerText.slice(0, -1) + item.innerText;
+      } else {
+        display.innerText += item.innerText;
+      }
+    }
+  };
 });
 
 const themeToggleBtn = document.querySelector(".theme-toggler");
@@ -24,7 +43,7 @@ const calculator = document.querySelector(".calculator");
 const toggleIcon = document.querySelector(".toggler-icon");
 let isDark = true;
 themeToggleBtn.onclick = () => {
-    calculator.classList.toggle("dark");
-    themeToggleBtn.classList.toggle("active");
-    isDark = !isDark;
-};
\ No newline at end of file
+  calculator.classList.toggle("dark");
+  themeToggleBtn.classList.toggle("active");
+  isDark = !isDark;
+};