Working on improving duplicate checking