All the previous changings. 

Please, try to merge all this stuff.