Added remaining checks