New shuffle implementation

No match.