updated many models for state management