Fixed all but the comparator