UniqueValues updated to not suck