new verify refactor