Add separate state field to demo app.
merge