updated scorer, quasi-working