Began adding more checks