Updates to v1.0.
Merge branch 'old-state'