Refactoring 2, and implement verify response