Mid-rework of scoring logic