nyacc: CPP working better now