revert latest changes

 - due to some problems: revert latest changes