Modify to avoid duplications