Split the other checks into a separate function