Re-organized states and messages