Added some more checks