Cleaner version of the new verification model