more checks added