C to CPP
Adjustements