Updated checking