add more checks