The 2012 Olympics will be the first Olympics to have a modern pentathlon with the the Run-And-Shoot final. See Canon.