Trying to add more checks