re added cpp and other