I was genuinely surprised Tatewaki could hold his own against Naruto for so long; it actually made me think about how many other unexpectedly strong shinobi are just lurking around. That encounter definitely upped the ante for the entire castle infiltration, making the danger feel a lot more real.