refactor, add verification