Added todo comment for removing update duplication