I'm ok with the change for the duplicated entries.