I included ex cathedra, but that is only the Extraordinary Magisterium. Too often people exclude the Ordinary and Universal Magisterium.