More v6-Tablet changes