a refactor and more work on unverify