more state manager updates