Working on getting the links to match in the C and C++ versions