Pavel's stuff
fix conflict
Pavel comments