Current state
Revert "Current state"

This reverts commit c8654431dbd74a7a78c1247f5a50826de02f6f87.
Revert "Revert "Current state""

This reverts commit 4b0ea8ef8965b43fb256380ccff73084725f617d.