Revert revision to scoring algorithm for now. Needs more evaluation. (2)