Final version
Revert "Final version"

This reverts commit b9fce908805baa386aa106bd74b0f4a59f0674ed.
Ready for delivery