Refactored states.