changes for convert to c++