add another parameter check and shift break further up