[PIVOT] design change hmmmm