Lots of changes. Sorry for such useless message