updating csmPPI with peter's changes
updating merge versions