improving a TODO comemnt, and maybe fixing the problem of the duplication check