worked on new state manager