[Code] Further revisions to do_score