Updated to full list of checks