Now to just deal with the state changes...