Updated cpp files.
Fix.