Revert "Update of the functionallity"

This reverts commit 9a14a97df38ec519abeec4cb79d5b1689a29f4e7.