Changed the way the response verification is made