Updates from Jean but confusion in comparators