Modified to allow for draws without entry counts