Revising the handling of state output.
Revising the handling of state output.