more changes to cpp