update changes according to commentaries

update changes according to commentaries
Merge pull request #1 from alex-savchuk/local_ie

update changes according to commentaries