Better state management.