Added the output state/view.
More disciplined naming convention.