discipline or diplomacy?