added duplication check, now we don't create shit we dont need