Updated the checks