Adding other checks