overhaul of state management