CPP UPGRADE: TEMPORARY REWORK…