adding more checks.