Comparator a bit better