Revert "Final version"

This reverts commit 43f84924dc29567c15a363cdaa1e9df96a7371e1.