Working to fix comparators