changing to C++