Last changes

I can't fix damned conflicts.