uniquify added (finally!)