Updated with scoring