--- a/data/npcs/kumiko.json	Sun Apr 10 01:59:29 2011 +0200
+++ b/data/npcs/kumiko.json	Sun Apr 10 01:59:40 2011 +0200
@@ -6,25 +6,12 @@
     "temptingfate" : {
         "text" : "The room smells fresh, I have my best kimono on and I’ve set out my most magnificent vase. Everything is perfect (just like me)!",
         "events" : [
-            { "matches" : "world.items.vase.broken", "next": "state.broken" }
-        ]
-    },
-    "broken" : {
-        "text" : "Oh no, my beautiful vase! What will the businessman think to see it broken on the floor?",
-        "events" : [
-            { "matches" : "world.missions.fish_in_room", "next": "state.badsmell" }
+            { "matches" : "world.items.vase.broken", "next": "state.complaining" }
         ]
     },
-    "badsmell" : {
-        "text" : "Oh my, what is that terrible smell? Rotten fish? Oh, this won’t do at all!",
+    "complaining" : {
         "events" : [
-            { "matches" : "world.missions.kumikos_kimono_torn", "next": "state.torn" }
-        ]
-    },
-    "torn" : {
-        "text" : "What will the businessman think of a ragged dress like this?",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'kumiko'", "next": "state.kaneda" }
+            { "matches" : "world.missions.kumikos_kimono_torn and world.missions.kumikos_kimono_torn and world.missions.fish_in_room", "next": "state.kaneda" }
         ]
     },
     "kaneda" : {