Added comparator and unsplat.