more changes to Comparator