more changes in C_C++