- added more checks