Some changes in conditionComparisonAnalysis