small state management changes