Start verify refactor