Try to make verify conditional