Just directly map the state changes...