Changed some c++.