This was originally in update_score(), would have caused conflict with your refactoring in PR #1766 so just putting int a comment here, will remake change once that is landed.