removing unique and making check more thorough