Undoing merge
Testing purposes. Merge branch 'old-state'