adjusted to use ConfigureMakeCp as suggested.