more work on CXX