Do more checks