Some changes to get scoring to work