Blast. I was really somewhat hoping we'd seen the last of Naoyuki, but he was just too good of an antagonist. I hate it when people CAUSE problems and then say they aren't going to be the one to cause the problems. GAH.