Honor choice r2 (16/32)

Honor choice r2