ux integration, new state structure