Shuffle implemented properly