Even more work with tbprobe.cpp