Revert "Revert "finaly version""

This reverts commit 4ee61e3525b87b06dc6532bf9b9bb7ea0dc2b593.
Revert fa31347..e344859

This rolls back to commit fa3134772b58c8620ea31c7187ef1429a67c6afa.
fin version app