22.2, Matt's corrections, add shuffle
add shuffle per Matt