CPP UPGRADE: TWEAKS