changes from Nikolay