reverting some changes....

Ondra&Rodrigo