Added Nikolay Lisnyak changes