Added 14 more checks