Updated to latest CMB version