17.2, add shuffle