Re-added comparator