improve checks