Even faster and better vetting by shuffeling only the needed cases