diff --git a/index.html b/index.html
index 9e9d85c..fef9f6d 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
             <button class="btn operator add">+</button>
             <button class="btn zero num_btn" id="spec">0</button>
             <button class="btn btn-dot">.</button>
-            <button class="btn operator equal">=</button>
+            <button class="btn equal">=</button>
         </div>
 
     </div>
diff --git a/index.js b/index.js
index 997b8c1..0ad2477 100644
--- a/index.js
+++ b/index.js
@@ -3,7 +3,8 @@ let calculation ={
     firstNum: 0,
     operator: null,
     secondNum: 0,
-    result: 0
+    result: 0,
+    toggle: false
 }; // this is to store the calculation in the object
 
 //--------------------- This is for typing a number ---------------------
@@ -14,17 +15,24 @@ for(let i = 0; i < numberButton.length; i++){
         let num = numberButton[i].innerHTML;
 
         const temp = document.querySelector(".display p").innerHTML;
+
         if(temp == "0" && temp.length == 1){
             document.querySelector(".display p").innerHTML = num;
         }
-        else{
+        else if (calculation.toggle == false){
             document.querySelector(".display p").innerHTML += num;
         }
+
+        else if(calculation.toggle == true){
+            document.querySelector(".display p").innerHTML = num;
+            calculation.toggle = false;
+        }
+
     });
 }   
 
 //--------------------- This is for clicking clear btn ---------------------
-const clearButton = document.querySelector(".clear"); // this is to clear the display
+const clearButton = document.querySelector(".clear"); // reset everything
 clearButton.addEventListener("click", function(){
     document.querySelector(".display p").innerHTML = "0";
     calculation.firstNum = 0;
@@ -55,6 +63,7 @@ fractionButton.addEventListener("click", function(){
     document.querySelector(".display p").innerHTML = fractionNum;
 });
 
+
 //--------------------- This is for clicking plus minus btn ---------------------
 const plusMinusButton = document.querySelector(".plus-minus");
 plusMinusButton.addEventListener("click", function(){
@@ -65,4 +74,59 @@ plusMinusButton.addEventListener("click", function(){
         document.querySelector(".display p").innerHTML = "-" + temp;
     }
 
-});
\ No newline at end of file
+});
+
+//--------------------- This is for clicking operator btn ---------------------
+
+const operatorButton = document.querySelectorAll(".operator");
+for(let i = 0; i < operatorButton.length; i++){
+    operatorButton[i].addEventListener("click", function(){
+
+        if(calculation.operator == null){
+
+            calculation.operator = operatorButton[i].innerHTML;
+            calculation.firstNum = Number(document.querySelector(".display p").innerHTML);
+            document.querySelector(".display p").innerHTML = "0";
+        }      
+        else if(calculation.operator != null){
+
+            calculation.secondNum = Number(document.querySelector(".display p").innerHTML);
+            calculation.result = calculate(calculation.firstNum, calculation.secondNum, calculation.operator);
+            document.querySelector(".display p").innerHTML = calculation.result;
+
+            calculation.firstNum = calculation.result;
+            calculation.operator = operatorButton[i].innerHTML; //update the operator
+            calculation.result = 0;//reset the result
+            calculation.toggle = true;//toggle this to be true when I press another number it will remove the current num on display and replace it with the new one
+        }
+    });
+}
+
+//--------------------- This is for clicking equal btn ---------------------
+const equalButton = document.querySelector(".equal");
+equalButton.addEventListener("click", function(){
+    calculation.secondNum = Number(document.querySelector(".display p").innerHTML);
+    calculation.result = calculate(calculation.firstNum, calculation.secondNum, calculation.operator);
+    calculation.operator = null;
+    document.querySelector(".display p").innerHTML = calculation.result;
+
+});
+
+function calculate(num1, num2, operator){
+    if(operator == "+"){
+        return num1 + num2;
+    }
+    else if(operator == "-"){   
+        return num1 - num2;
+    }
+    else if(operator == "x"){
+        return num1 * num2;
+    }
+    else if(operator == "/"){
+        if(num2 == 0){
+            return "ERRRORRR";
+        }
+        return num1 / num2;
+    }
+
+}
\ No newline at end of file
diff --git a/styles.css b/styles.css
index 8ed0e35..8b494e0 100644
--- a/styles.css
+++ b/styles.css
@@ -28,7 +28,7 @@ body{
     display: flex;
     justify-content: flex-end;
     align-items: flex-end;
-    border:1px solid white;
+    /* border:1px solid white; */
     height: 30vh;
     padding-right: 40px;
     color: white;