Added more comparisons