Verifs needed is better

See commits for details.