Changed to C++