Added a few more checks to checks :)