--- a/data/npcs/tetsuo.json	Sat Apr 09 00:26:24 2011 +0200
+++ b/data/npcs/tetsuo.json	Sat Apr 09 00:38:53 2011 +0200
@@ -1,20 +1,18 @@
 {
     "start" : {
         "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'start'", "next": "state.joy" }
+            { "matches" : "npcs.kaneda2.state !=  'start'", "next": "state.joy" }
         ]
     },
     "joy" : {
         "text" : "Kaneda-san, nothing would bring me more joy.",
-        "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'signing'", "next": "state.inspect" }
-        ]
+        "auto_next" : "state.inspect",
+        "on_exit" : "switch_to('kaneda2')"
     },
     "inspect" : {
         "text" : "Naturally, as soon as I inspect the goods.",
-        "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'ofcourse'", "next": "state.inspecting" }
-        ]
+        "auto_next" : "state.inspecting",
+        "on_exit" : "switch_to('kaneda2')"
     },
     "inspecting" : {
         "events" : [
@@ -23,21 +21,17 @@
     },
     "shoddy" : {
         "text" : "You should speak! The shoddy nature of your goods is simply unacceptable.",
-        "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'pah'", "next": "state.cheat" }
-        ]
+        "auto_next" : "state.cheat",
+        "on_exit" : "switch_to('kaneda2')"
     },
     "cheat" : {
         "text" : "At least we don’t cheat our buyers with damaged goods like you city folk!",
-        "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'insult'", "next": "state.riddance" }
-        ]
+        "auto_next" : "state.riddance",
+        "on_exit" : "switch_to('kaneda2')"
     },
     "riddance" : {
         "text" : "Good riddance.",
-        "events" : [
-            { "matches" : "npcs.kaneda2.state ==  'gone'", "next": "state.done" }
-        ]
+        "auto_next": "state.done"
     },
     "done" : {
     }