More contrib champion stuff.