Updated for scoring