Comparator modified
Last version !