More C++ draft