Changed order of Cd models to fit "without energy" before "with energy".