adding more checks
New version