diff --git a/images/calculator.png b/images/calculator.png
new file mode 100644
index 0000000..69861fd
Binary files /dev/null and b/images/calculator.png differ
diff --git a/index.html b/index.html
index df6b231..1a3958e 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>Calculator</title>
   <link href="styles.css" rel="stylesheet">
+  <link rel="icon" type="image/x-icon" href="images/calculator.png">
   <script src="script.js" defer></script>
 </head>
 <body>
@@ -14,24 +15,72 @@
       <div data-previous-operand class="previous-operand"></div>
       <div data-current-operand class="current-operand"></div>
     </div>
-    <button data-all-clear class="span-two">AC</button>
-    <button data-delete>DEL</button>
-    <button data-operation>÷</button>
-    <button data-number>1</button>
-    <button data-number>2</button>
-    <button data-number>3</button>
-    <button data-operation>*</button>
-    <button data-number>4</button>
-    <button data-number>5</button>
-    <button data-number>6</button>
-    <button data-operation>+</button>
-    <button data-number>7</button>
-    <button data-number>8</button>
-    <button data-number>9</button>
-    <button data-operation>-</button>
-    <button data-number>.</button>
-    <button data-number>0</button>
-    <button data-equals class="span-two">=</button>
+    <button data-all-clear class="span-two">
+      AC
+    </button>
+    <button data-delete>
+      DEL
+    </button>
+    <button data-operation>
+      %
+    </button>
+    <button data-operation>
+      !
+    </button>
+    <button data-operation>
+      &Sqrt;
+    </button>
+    <button data-operation>
+      &sup2;
+    </button>
+    <button data-operation>
+      ÷
+    </button>    
+    <button data-number>
+      1
+    </button>
+    <button data-number>
+      2
+    </button>
+    <button data-number>
+      3
+    </button>
+    <button data-operation>
+      *
+    </button>
+    <button data-number>
+      4
+    </button>
+    <button data-number>
+      5
+    </button>
+    <button data-number>
+      6
+    </button>
+    <button data-operation>
+      +
+    </button>
+    <button data-number>
+      7
+    </button>
+    <button data-number>
+      8
+    </button>
+    <button data-number>
+      9
+    </button>
+    <button data-operation>
+      -
+    </button>
+    <button data-number>
+      .
+    </button>
+    <button data-number>
+      0
+    </button>
+    <button data-equals class="span-two">
+      =
+    </button>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/script.js b/script.js
index 4c8aa9d..822c138 100644
--- a/script.js
+++ b/script.js
@@ -24,17 +24,25 @@ class Calculator {
     if (this.currentOperand === '') return
     if (this.previousOperand !== '') {
       this.compute()
-    }
+    }    
     this.operation = operation
     this.previousOperand = this.currentOperand
     this.currentOperand = ''
   }
 
   compute() {
+    let indicator = 0;
+    if(aSpecialOperations.indexOf(this.operation)> -1){
+      indicator = 1;
+    }
     let computation
     const prev = parseFloat(this.previousOperand)
     const current = parseFloat(this.currentOperand)
-    if (isNaN(prev) || isNaN(current)) return
+    if(!indicator){
+      if ((isNaN(prev)) || isNaN(current)) return
+    }else{
+      if (isNaN(prev)) return
+    }
     switch (this.operation) {
       case '+':
         computation = prev + current
@@ -47,6 +55,21 @@ class Calculator {
         break
       case '÷':
         computation = prev / current
+      case '%':
+        computation = prev * current / 100
+        break
+      case '!':
+        let result = 1;
+        for(let i=1; i <= prev; i++){
+          result = result * i;
+        }
+        computation = result
+        break
+      case '²':
+        computation = prev * prev
+        break
+      case '√':
+        computation = Math.round(Math.sqrt(prev) * roundNumbers) / roundNumbers
         break
       default:
         return
@@ -82,6 +105,9 @@ class Calculator {
     } else {
       this.previousOperandTextElement.innerText = ''
     }
+    if(aSpecialOperations.indexOf(this.operation)> -1){
+      document.querySelector('[data-equals]').dispatchEvent(new Event("click"));
+    }
   }
 }
 
@@ -93,6 +119,8 @@ const deleteButton = document.querySelector('[data-delete]')
 const allClearButton = document.querySelector('[data-all-clear]')
 const previousOperandTextElement = document.querySelector('[data-previous-operand]')
 const currentOperandTextElement = document.querySelector('[data-current-operand]')
+const roundNumbers = 100000
+const aSpecialOperations = ['!', '√', '²'];
 
 const calculator = new Calculator(previousOperandTextElement, currentOperandTextElement)
 
@@ -123,4 +151,4 @@ allClearButton.addEventListener('click', button => {
 deleteButton.addEventListener('click', button => {
   calculator.delete()
   calculator.updateDisplay()
-})
\ No newline at end of file
+})
