Added shuffle and unique