Adding older code to merge to make Verify async