.08 include upgrade CP calc in level-1 optimize