Reworking comparator.