more C++ hacking