Some changes after wise advices of Sacha