restructured states and models