Last uncommited changes

sorry for changes of all files. I had to restore backup