Code updates

C++ code still needs to be processed