Redone C function, Removed CPP member