Switched to c++