C++ code

C++ commit

This reverts commit 367d0f2acf352ddd4cbf38526e58fdaf89389021.