(CSCS2650) More conversion to C++