changes towards cpp