recent changes on the c++ code