--- a/data/npcs/kumiko.json	Sat Apr 09 00:56:34 2011 +0200
+++ b/data/npcs/kumiko.json	Sat Apr 09 00:49:54 2011 +0200
@@ -29,42 +29,40 @@
     },
     "kaneda" : {
         "text" : "Kaneda-san! I have been waiting for you.",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'tear'", "next": "state.jumped" }
-        ]
+        "auto_next" : "state.jumped",
+        "on_exit" : "switch_to('kaneda')"
     },
     "jumped" : {
         "text" : "Oh, Kaneda-san, a dirty little fox jumped on me just as you were approaching and ripped my kimono.",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'vase'", "next": "state.fallen" }
-        ]
+        "auto_next": "state.fallen",
+        "on_exit" : "switch_to('kaneda')"
     },
     "fallen" : {
         "text" : "I am sorry, Kaneda-san, it must just have fallen over. It was probably pushed by that mean-spirited fox.",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'hmm'", "next": "state.shallwe" }
-        ]
+        "auto_next": "state.shallwe",
+        "on_exit" : "switch_to('kaneda')"
     },
     "shallwe" : {
         "text" : "Shall we- go on?",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'smell'", "next": "state.dropped" }
-        ]
+        "auto_next": "state.dropped",
+        "on_exit" : "switch_to('kaneda')"
     },
     "dropped" : {
         "text" : "I- A fox came in and dropped an old fish?",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'wontstand'", "next": "state.but" }
-        ]
+        "auto_next": "state.but",
+        "on_exit" : "switch_to('kaneda')"
     },
     "but" : {
         "text" : "But-",
-        "events" : [
-            { "matches" : "npcs.kaneda.state == 'wonthear'", "next": "state.curse" }
-        ]
+        "auto_next": "state.curse",
+        "on_exit" : "switch_to('kaneda')"
     },
     "curse" : {
         "text" : "Curse you, fox! I’ll be doomed to a peasant life forever!",
+        "auto_next": "state.sob",
         "on_exit": "world.missions.kumiko_disgraced = True"
+    },
+    "sob" : {
+        "text" : "*sob*"
     }
 }