diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..94930ee1
Binary files /dev/null and b/.DS_Store differ
diff --git a/ruby/gilded_rose.rb b/ruby/gilded_rose.rb
index e177a497..5fdac9f5 100644
--- a/ruby/gilded_rose.rb
+++ b/ruby/gilded_rose.rb
@@ -1,3 +1,5 @@
+require 'pry'
+
 class GildedRose
 
   def initialize(items)
@@ -6,25 +8,15 @@ class GildedRose
 
   def update_quality()
     @items.each do |item|
-      if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert"
-        if item.quality > 0
-          if item.name != "Sulfuras, Hand of Ragnaros"
+      inListOfThree = ["Aged Brie","Backstage passes to a TAFKAL80ETC concert","Sulfuras, Hand of Ragnaros"]
+      if not inListOfThree.include?(item.name) and item.quality > 0
             item.quality = item.quality - 1
-          end
-        end
       else
         if item.quality < 50
           item.quality = item.quality + 1
           if item.name == "Backstage passes to a TAFKAL80ETC concert"
             if item.sell_in < 11
-              if item.quality < 50
                 item.quality = item.quality + 1
-              end
-            end
-            if item.sell_in < 6
-              if item.quality < 50
-                item.quality = item.quality + 1
-              end
             end
           end
         end
@@ -35,13 +27,7 @@ class GildedRose
       if item.sell_in < 0
         if item.name != "Aged Brie"
           if item.name != "Backstage passes to a TAFKAL80ETC concert"
-            if item.quality > 0
-              if item.name != "Sulfuras, Hand of Ragnaros"
-                item.quality = item.quality - 1
-              end
-            end
-          else
-            item.quality = item.quality - item.quality
+            item.quality = 0
           end
         else
           if item.quality < 50
diff --git a/ruby/gilded_rose_spec.rb b/ruby/gilded_rose_spec.rb
index 269fe1b0..e748d09d 100644
--- a/ruby/gilded_rose_spec.rb
+++ b/ruby/gilded_rose_spec.rb
@@ -1,12 +1,12 @@
 require File.join(File.dirname(__FILE__), 'gilded_rose')
+require 'pry'
 
 describe GildedRose do
-
   describe "#update_quality" do
     it "does not change the name" do
       items = [Item.new("foo", 0, 0)]
       GildedRose.new(items).update_quality()
-      expect(items[0].name).to eq "fixme"
+      expect(items[0].name).to eq "foo"
     end
   end
 
diff --git a/ruby/gilded_rose_tests.rb b/ruby/gilded_rose_tests.rb
index 2e1b70d1..98c12418 100644
--- a/ruby/gilded_rose_tests.rb
+++ b/ruby/gilded_rose_tests.rb
@@ -6,7 +6,7 @@ class TestUntitled < Test::Unit::TestCase
   def test_foo
     items = [Item.new("foo", 0, 0)]
     GildedRose.new(items).update_quality()
-    assert_equal items[0].name, "fixme"
+    assert_equal items[0].name, "foo"
   end
 
-end
\ No newline at end of file
+end