Switch to c++
--C will not be forgotten!