Comparator Shims

Comparator Shims