Merge pull request #1 from nanophate/old-state

Old state