Merge in the changes with show_result.cpp