vol 2: Unify scoring functions