20.3, 21.1- corrections and add shuffle per Matt