changed cpp convetion