Updated CMP and CPI