cphi's changes