Updated Comparator