Revert "some changes"

This reverts commit 771ed2cae34e5a61bd6adb313eabc6be41b5e1b7.
To master
Final Changes