Revert "Revert "InitialState""

This reverts commit 2ea28af1d88de68c1b6f15962590c17ff2ed7fa8.