Working on preventing duplication while editing