20.3, add 2 problems left out of shuffle to shuffle, per Matt