Updated Daniel's Unique as a test
Merging offline with master