Revert "sereral changes"

This reverts commit ae9af91d4d8a57eeddb80b84b8108c6461e4b707.