Update for C++ coding