improve auto verify method