diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt
index e8856ae9..38e7be82 100644
--- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt
+++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt
@@ -2,12 +2,10 @@ package com.gildedrose
 
 class GildedRose(val items: List<Item>) {
 
-    fun updateQualityClara() {
+    fun updateQuality() {
         for (i in items.indices) {
-            items[i].sellIn -= 1
-
-            if (items[i].name == "Sulfuras, Hand of Ragnaros") { //might not be necessary
-                items[i].quality = items[i].quality
+            if (items[i].name != "Sulfuras, Hand of Ragnaros") {
+                items[i].sellIn -= 1
             }
 
             if (items[i].name == "Aged Brie") {
@@ -19,7 +17,7 @@ class GildedRose(val items: List<Item>) {
 
             }
 
-            if (items[i].name == "Backstage passes to a TAFKAL80ETC concert" && items[i].sellIn < 0) {
+            if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") {
                 if (items[i].sellIn < 0) {
                     items[i].quality = 0
                 } else if (items[i].sellIn in 6..10) {
@@ -41,7 +39,7 @@ class GildedRose(val items: List<Item>) {
 
             }
 
-            if (items[i].name == "Conjured Mana Cake" || items[i].name == "Elixir og the Mongoose") {
+            if (items[i].name == "Conjured Mana Cake") {
 
                 if (items[i].sellIn < 0) {
                     items[i].quality -= 4
@@ -51,11 +49,21 @@ class GildedRose(val items: List<Item>) {
 
             }
 
+            if (items[i].name == "Elixir of the Mongoose") {
+
+                if (items[i].sellIn < 0) {
+                    items[i].quality -= 2
+                } else {
+                    items[i].quality -= 1
+                }
+
+            }
+
             if (items[i].quality >= 50 && items[i].name != "Sulfuras, Hand of Ragnaros") {
                 items[i].quality = 50
             }
 
-            if (items[i].quality == 0) {
+            if (items[i].quality < 0) {
                 items[i].quality = 0
             }
 
@@ -63,59 +71,4 @@ class GildedRose(val items: List<Item>) {
     }
 
 
-
-
-
-    fun updateQuality() {
-        for (i in items.indices) {
-            if (items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert") {
-                if (items[i].quality > 0) {
-                    if (items[i].name != "Sulfuras, Hand of Ragnaros") {
-                        items[i].quality = items[i].quality - 1
-                    }
-                }
-            } else {
-                if (items[i].quality < 50) {
-                    items[i].quality = items[i].quality + 1
-
-                    if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") {
-                        if (items[i].sellIn < 11) {
-                            if (items[i].quality < 50) {
-                                items[i].quality = items[i].quality + 1
-                            }
-                        }
-
-                        if (items[i].sellIn < 6) {
-                            if (items[i].quality < 50) {
-                                items[i].quality = items[i].quality + 1
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (items[i].name != "Sulfuras, Hand of Ragnaros") {
-                items[i].sellIn = items[i].sellIn - 1
-            }
-
-            if (items[i].sellIn < 0) {
-                if (items[i].name != "Aged Brie") {
-                    if (items[i].name != "Backstage passes to a TAFKAL80ETC concert") {
-                        if (items[i].quality > 0) {
-                            if (items[i].name != "Sulfuras, Hand of Ragnaros") {
-                                items[i].quality = items[i].quality - 1
-                            }
-                        }
-                    } else {
-                        items[i].quality = items[i].quality - items[i].quality
-                    }
-                } else {
-                    if (items[i].quality < 50) {
-                        items[i].quality = items[i].quality + 1
-                    }
-                }
-            }
-        }
-    }
-
 }
diff --git a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt
index a36734b1..e126c232 100644
--- a/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt
+++ b/Kotlin/src/main/kotlin/com/gildedrose/TexttestFixture.kt
@@ -30,6 +30,6 @@ fun main(args: Array<String>) {
             println(item)
         }
         println()
-        app.updateQualityClara()
+        app.updateQuality()
     }
 }
diff --git a/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt b/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt
index fa99055e..73fd296e 100644
--- a/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt
+++ b/Kotlin/src/test/kotlin/com/gildedrose/GildedRoseTest.kt
@@ -139,7 +139,7 @@ internal class GildedRoseTest {
 
 
 
-    /*
+
     @Test
     fun  conjuredBasic() {
         val items = listOf(Item("Conjured Mana Cake", 3, 6))
@@ -150,7 +150,7 @@ internal class GildedRoseTest {
         assertEquals(4, app.items[0].quality)
     }
 
-*/
+
 
 
 }