20.2, temporarily remove shuffle for Matt's review