Added the remaining checks