             case .Add:
                 output = value1 + value2
             case .Equal:
-                return previousOperand
+                return currentOperand
             default:
                 break
             }
-            previousOperand = formatValue(output)
+            currentOperand = formatValue(output)
         }
-        currentOperand = resetOperand()
+        previousOperand = resetOperand()
         storedOperator = .Equal
-        return previousOperand
+        return currentOperand
     }
     
     func clearAll() -> String {

            currentOperand = operand
        } else {
            currentOperand += operand
        }
        
        if automaticDecimal {

    func storeOperator(rawValue: Int) -> String {
        if storedOperator != nil && storedOperator != .Equal {
            previousOperand = computeFinalValue()
        } else if storedOperator == .Equal && rawValue == CalculatorKey.Equal.rawValue {
            return currentOperand
        } else {
            previousOperand = currentOperand
        }
