Use new pub/sub to pass state changes