Tweaks. Tried and failed with new scorer